diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | awkgram.c | 4 | ||||
| -rw-r--r-- | awkgram.y | 4 | ||||
| -rw-r--r-- | cmd.h | 2 | ||||
| -rw-r--r-- | dfa.c | 1 | ||||
| -rw-r--r-- | extension/ChangeLog | 4 | ||||
| -rw-r--r-- | extension/gawkfts.c | 2 |
9 files changed, 22 insertions, 8 deletions
@@ -1,3 +1,11 @@ +2013-01-25 Arnold D. Robbins <arnold@skeeve.com> + + * awkgram.y (parms_shadow): Change int param to bool. + * cmd.h (output_is_tty): Sync type with rest of code (is bool). + * dfa.c (MALLOC): Undef first, for Irix. + * Makefile.am (LDADD): Use LIBREADLINE and LIBMPFR instead of + automake substitutions. + 2013-01-23 Arnold D. Robbins <arnold@skeeve.com> * awk.h (list_functions): Change parameter to bool. diff --git a/Makefile.am b/Makefile.am index 085eadfe..8d387e98 100644 --- a/Makefile.am +++ b/Makefile.am @@ -130,7 +130,7 @@ base_sources = \ gawk_SOURCES = $(base_sources) # Get extra libs as needed, Automake will supply LIBINTL and SOCKET_LIBS. -LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) @LIBREADLINE@ @LIBMPFR@ +LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) $(LIBREADLINE) $(LIBMPFR) # Directory for gawk's data files. Automake supplies datadir. pkgdatadir = $(datadir)/awk diff --git a/Makefile.in b/Makefile.in index 2c7e9489..40d0be95 100644 --- a/Makefile.in +++ b/Makefile.in @@ -117,6 +117,7 @@ gawk_OBJECTS = $(am_gawk_OBJECTS) gawk_LDADD = $(LDADD) am__DEPENDENCIES_1 = gawk_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -458,7 +459,7 @@ base_sources = \ gawk_SOURCES = $(base_sources) # Get extra libs as needed, Automake will supply LIBINTL and SOCKET_LIBS. -LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) @LIBREADLINE@ @LIBMPFR@ +LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) $(LIBREADLINE) $(LIBMPFR) # stuff for compiling gawk/pgawk DEFPATH = '".$(PATH_SEPARATOR)$(pkgdatadir)"' @@ -87,7 +87,7 @@ static char **check_params(char *fname, int pcount, INSTRUCTION *list); static int install_function(char *fname, INSTRUCTION *fi, INSTRUCTION *plist); static NODE *mk_rexp(INSTRUCTION *exp); static void param_sanity(INSTRUCTION *arglist); -static int parms_shadow(INSTRUCTION *pc, int *shadow); +static int parms_shadow(INSTRUCTION *pc, bool *shadow); #ifndef NO_LINT static int isnoeffect(OPCODE type); #endif @@ -6530,7 +6530,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) /* parms_shadow --- check if parameters shadow globals */ static int -parms_shadow(INSTRUCTION *pc, int *shadow) +parms_shadow(INSTRUCTION *pc, bool *shadow) { int pcount, i; bool ret = false; @@ -46,7 +46,7 @@ static char **check_params(char *fname, int pcount, INSTRUCTION *list); static int install_function(char *fname, INSTRUCTION *fi, INSTRUCTION *plist); static NODE *mk_rexp(INSTRUCTION *exp); static void param_sanity(INSTRUCTION *arglist); -static int parms_shadow(INSTRUCTION *pc, int *shadow); +static int parms_shadow(INSTRUCTION *pc, bool *shadow); #ifndef NO_LINT static int isnoeffect(OPCODE type); #endif @@ -3994,7 +3994,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) /* parms_shadow --- check if parameters shadow globals */ static int -parms_shadow(INSTRUCTION *pc, int *shadow) +parms_shadow(INSTRUCTION *pc, bool *shadow) { int pcount, i; bool ret = false; @@ -38,7 +38,7 @@ extern int gprintf(FILE *fp, const char *format, ...); extern jmp_buf pager_quit_tag; extern bool pager_quit_tag_valid; -extern int output_is_tty; +extern bool output_is_tty; extern int input_fd; extern bool input_from_tty; extern FILE *out_fp; @@ -480,6 +480,7 @@ static void regexp (void); (sizeof (t) == 1 ? xzalloc (n) : xcalloc (n, sizeof (t))) #define CALLOC(p, n) do { (p) = XCALLOC (n, *(p)); } while (0) +#undef MALLOC /* Irix defines this */ #define MALLOC(p, n) do { (p) = XNMALLOC (n, *(p)); } while (0) #define REALLOC(p, n) do {(p) = xnrealloc (p, n, sizeof (*(p))); } while (0) diff --git a/extension/ChangeLog b/extension/ChangeLog index e2490e92..4752e959 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,7 @@ +2013-01-25 Arnold D. Robbins <arnold@skeeve.com> + + * gawkfts.c: Make include of <limits.h> be unconditional. + 2013-01-22 Arnold D. Robbins <arnold@skeeve.com> Improve portability. We hope. diff --git a/extension/gawkfts.c b/extension/gawkfts.c index 2a03b4f1..e70a154b 100644 --- a/extension/gawkfts.c +++ b/extension/gawkfts.c @@ -41,12 +41,12 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #define _BSD_SOURCE +#include <limits.h> /* #include "namespace.h" */ #ifndef ZOS_USS #include <sys/param.h> #else #include <stdio.h> -#include <limits.h> #endif /* ZOS_USS */ #include <sys/stat.h> |