[gawk-diffs] [SCM] gawk branch, master, updated. gawk-4.1.0-2391-g0098373

[John Malmberg]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, master has been updated
       via  0098373ed5cb15f4dc2e3a59e0efb872827fe7f1 (commit)
      from  7d02088c7c8731ae5c5b2810d1c30d7f77b29687 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=0098373ed5cb15f4dc2e3a59e0efb872827fe7f1

commit 0098373ed5cb15f4dc2e3a59e0efb872827fe7f1
Author: John Malmberg <address@hidden>
Date:   Thu Dec 22 23:58:43 2016 -0600

    Update OpenVMS for support directory

diff --git a/support/ChangeLog b/support/ChangeLog
index be46a1c..80164c3 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-22         John E. Malmberg      <address@hidden>
+
+        * dfa.c fixes for OpenVMS
+
 2016-12-22         Arnold D. Robbins     <address@hidden>
 
        * ChangeLog: Created.
diff --git a/support/dfa.c b/support/dfa.c
index 8f34c4c..d4ecbe9 100644
--- a/support/dfa.c
+++ b/support/dfa.c
@@ -24,7 +24,12 @@
 
 #include <assert.h>
 #include <ctype.h>
+#ifndef VMS
 #include <stdint.h>
+#else
+#define SIZE_MAX __INT32_MAX
+#define PTRDIFF_MAX __INT32_MAX
+#endif
 #include <stdio.h>
 
 #ifndef VMS
@@ -2138,7 +2143,7 @@ merge_constrained (position_set const *s1, position_set 
const *s2,
 static void
 merge (position_set const *s1, position_set const *s2, position_set *m)
 {
-  return merge_constrained (s1, s2, -1, m);
+  merge_constrained (s1, s2, -1, m);
 }
 
 /* Delete a position from a set.  Return the nonzero constraint of the
diff --git a/vms/ChangeLog b/vms/ChangeLog
index a5cdd08..a2354c1 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-22         John E. Malmberg      <address@hidden>
+
+        * vmsbuild.com, descrip.mms:
+        Update for new [.support] directory.
+
 2016-11-24         John E. Malmberg      <address@hidden>
 
         * gawk_verb.com: correct location for gawk executable.
diff --git a/vms/descrip.mms b/vms/descrip.mms
index 5e83b41..5981689 100644
--- a/vms/descrip.mms
+++ b/vms/descrip.mms
@@ -38,6 +38,7 @@
 #
 
 # location of various source files, relative to the 'main' directory
+SUPPORT = [.support]
 VMSDIR = [.vms]
 DOCDIR = [.doc]
 MISSNGD        = [.missing_d]
@@ -75,8 +76,9 @@ CFLOAT        = /float=ieee/ieee_mode=denorm_results
 .endif
 CNAME  = /NAME=(AS_IS,SHORT)
 CC     = cc/DECC/Prefix=All/NESTED_INCLUDE=NONE$(CFLOAT)
-CFLAGS = /Incl=([],[.vms])/Obj=[]/Def=($(CDEFS))$(CNAME) $(CCFLAGS)
-CEFLAGS = /Incl=([],[.vms],[.missing_d],[.extension])$(CNAME) $(CCFLAGS)
+CINC1   = [],[.VMS],$(SUPPORT)
+CFLAGS = /Incl=($(CINC1))/Obj=[]/Def=($(CDEFS))$(CNAME) $(CCFLAGS)
+CEFLAGS = /Incl=($(CINC1),[.missing_d],[.extension])$(CNAME) $(CCFLAGS)
 LIBS   =       # DECC$SHR instead of VAXCRTL, no special link option needed
 .endif !VAXC
 .endif !GNUC
@@ -105,8 +107,8 @@ AWKOBJ1 = array.obj,awkgram.obj,builtin.obj,cint_array.obj,\
        command.obj,debug.obj,dfa.obj,ext.obj,field.obj,\
        floatcomp.obj,gawkapi.obj,gawkmisc.obj,getopt.obj,getopt1.obj
 
-AWKOBJ2 = int_array.obj,io.obj,main.obj,mpfr.obj,msg.obj,node.obj,\
-       random.obj,re.obj,regex.obj,replace.obj,\
+AWKOBJ2 = int_array.obj,io.obj,localeinfo.obj,main.obj,mpfr.obj,msg.obj,\
+       node.obj,random.obj,re.obj,regex.obj,replace.obj,\
        str_array.obj,symbol.obj,version.obj
 
 AWKOBJS = $(AWKOBJ1),$(AWKOBJ2)
@@ -153,8 +155,8 @@ gawk.opt : $(MAKEFILE) config.h         # create linker 
options file
       $ @$(VMSDIR)gawk_ident.com
 
 $(VMSCODE)     : awk.h config.h $(VMSDIR)redirect.h $(VMSDIR)vms.h
-$(AWKOBJS)     : awk.h gettext.h mbsupport.h regex.h dfa.h config.h \
-                 $(VMSDIR)redirect.h
+$(AWKOBJS)     : awk.h gettext.h mbsupport.h $(SUPPORT)regex.h \
+                 $(SUPPORT)dfa.h config.h $(VMSDIR)redirect.h
 $(GAWKOBJ)     : awk.h config.h $(VMSDIR)redirect.h
 
 #-----------------------------------------------------------------------------
@@ -164,30 +166,32 @@ $(GAWKOBJ)        : awk.h config.h $(VMSDIR)redirect.h
 
 array.obj      : array.c
 awkgram.obj    : awkgram.c awk.h
-builtin.obj    : builtin.c floatmagic.h random.h
+builtin.obj    : builtin.c floatmagic.h $(SUPPORT)random.h
 cint_array.obj : cint_array.c
 command.obj    : command.c cmd.h
 debug.obj      : debug.c cmd.h
-dfa.obj                : dfa.c dfa.h
+dfa.obj                : $(SUPPORT)dfa.c $(SUPPORT)dfa.h
 ext.obj                : ext.c
 eval.obj       : eval.c
 field.obj      : field.c
 floatcomp.obj  : floatcomp.c
 gawkaoi.obj    : gawkapi.c
 gawkmisc.obj   : gawkmisc.c $(VMSDIR)gawkmisc.vms
-getopt.obj     : getopt.c
-getopt1.obj    : getopt1.c
+getopt.obj     : $(SUPPORT)getopt.c
+getopt1.obj    : $(SUPPORT)getopt1.c
 int_array.obj  : int_array.c
 io.obj         : io.c
+localeinfo.obj  : $(SUPPORT)localeinfo.c
 main.obj       : main.c
 msg.obj                : msg.c
 mpfr.obj       : mpfr.c
 node.obj       : node.c
 profile.obj    : profile.c
-random.obj     : random.c random.h
+random.obj     : $(SUPPORT)random.c $(SUPPORT)random.h
 re.obj         : re.c
-regex.obj      : regex.c regcomp.c regex_internal.c regexec.c regex.h \
-                 regex_internal.h
+regex.obj      : $(SUPPORT)regex.c $(SUPPORT)regcomp.c \
+                 $(SUPPORT)regex_internal.c $(SUPPORT)regexec.c \
+                 $(SUPPORT)regex.h $(SUPPORT)regex_internal.h
 str_array.obj  : str_array.c
 symbol.obj     : symbol.c
 version.obj    : version.c
diff --git a/vms/vmsbuild.com b/vms/vmsbuild.com
index 984b83f..9582c01 100644
--- a/vms/vmsbuild.com
+++ b/vms/vmsbuild.com
@@ -19,7 +19,7 @@ $ then
 $! assumes VAX
 $   CC = "gcc"
 $   if f$type(gcc).eqs."STRING" then  CC = gcc
-$   CFLAGS = "/Incl=([],[.vms])/Obj=[]/Def=(''CDEFS')''CCFLAGS'"
+$   CFLAGS = "/Incl=([],[.vms],[.SUPPORT])/Obj=[]/Def=(''CDEFS')''CCFLAGS'"
 $   LIBS = "gnu_cc:[000000]gcclib.olb/Library,sys$library:vaxcrtl.olb/Library"
 $   if p2.eqs."DO_GNUC_SETUP" then  set command gnu_cc:[000000]gcc
 $ else !!GNUC
@@ -41,7 +41,8 @@ $ endif
 $   CC = "cc/DECC/Prefix=All"
 $   CNAME = "/NAME=(AS_IS,SHORT)
 $   CINC = "/NESTED_INCLUDE=NONE"
-$   CFLAGS = "/Incl=([],[.vms])/Obj=[]/Def=(''CDEFS')''CINC'''CCFLAGS'"
+$   CINC1 = "[],[.vms],[.support]"
+$   CFLAGS = "/Incl=(''CINC1')/Obj=[]/Def=(''CDEFS')''CINC'''CCFLAGS'"
 $   CFLAGS = CNAME + CFLOAT + CFLAGS
 $   LIBS = ""  ! DECC$SHR instead of VAXCRTL, no special link option needed
 $  endif !VAXC
@@ -80,20 +81,21 @@ $ v1 = f$verify(1)
 $ cc array.c
 $ cc awkgram.c
 $ cc builtin.c
-$ cc dfa.c
+$ cc [.support]dfa.c
 $ cc ext.c
 $ cc field.c
 $ cc floatcomp.c
 $ cc gawkmisc.c
-$ cc getopt.c
-$ cc getopt1.c
+$ cc [.support]getopt.c
+$ cc [.support]getopt1.c
 $ cc io.c
+$ cc [.support]localeinfo.c
 $ cc main.c
 $ cc msg.c
 $ cc node.c
-$ cc random.c
+$ cc [.support]random.c
 $ cc re.c
-$ cc regex.c
+$ cc [.support]regex.c
 $ cc replace.c
 $ cc version.c
 $ cc eval.c
@@ -120,7 +122,7 @@ $ close/noLog Fopt
 $ create gawk.opt
 ! GAWK -- GNU awk
 array.obj,awkgram.obj,builtin.obj,dfa.obj,ext.obj,field.obj,floatcomp.obj
-gawkmisc.obj,getopt.obj,getopt1.obj,io.obj
+gawkmisc.obj,getopt.obj,getopt1.obj,io.obj,localeinfo.obj
 main.obj,msg.obj,node.obj
 random.obj,re.obj,regex.obj,replace.obj,version.obj,eval.obj,profile.obj
 command.obj,debug.obj,int_array.obj,cint_array.obj,gawkapi.obj,mpfr.obj

-----------------------------------------------------------------------

Summary of changes:
 support/ChangeLog |    4 ++++
 support/dfa.c     |    7 ++++++-
 vms/ChangeLog     |    5 +++++
 vms/descrip.mms   |   30 +++++++++++++++++-------------
 vms/vmsbuild.com  |   18 ++++++++++--------
 5 files changed, 42 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
gawk