diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | array.c | 4 | ||||
| -rw-r--r-- | builtin.c | 4 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | io.c | 2 | ||||
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/readline.m4 | 2 | ||||
| -rw-r--r-- | pc/ChangeLog | 5 | ||||
| -rw-r--r-- | pc/config.h | 6 | ||||
| -rw-r--r-- | re.c | 2 |
10 files changed, 34 insertions, 10 deletions
@@ -1,3 +1,12 @@ +Tue Jan 4 11:21:18 2011 Arnold D. Robbins <arnold@skeeve.com> + + Clean up some compiler warnings: + + * array.c (do_delete): Cast for printf. + * builtin.c (do_bindtextdomain): Casts for const char *. + * io.c (rs1scan): Cast for indexing of array. + * re.c (add_char): Remove unused variables. + Fri Dec 31 11:05:11 2010 Michal Jaegermann <michal@harddata.com> * awk.h (strncasecmpmbs): Change parameters to const char *. @@ -703,7 +703,9 @@ do_delete(NODE *symbol, int nsubs) /* e.g.: a[1] = 1; delete a[1][1] */ free_subs(nsubs); fatal(_("attempt to use scalar `%s[\"%.*s\"]' as an array"), - symbol->vname, bucket->ahname_len, bucket->ahname_str); + symbol->vname, + (int) bucket->ahname_len, + bucket->ahname_str); } else unref(bucket->ahvalue); @@ -2394,13 +2394,13 @@ do_bindtextdomain(int nargs) if (nargs == 2) { /* second argument */ t2 = POP_STRING(); - domain = t2->stptr; + domain = (const char *) t2->stptr; } /* first argument */ t1 = POP_STRING(); if (t1->stlen > 0) - directory = t1->stptr; + directory = (const char *) t1->stptr; the_result = bindtextdomain(domain, directory); @@ -10283,15 +10283,15 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline via \"$_combo\" is present and sane" >&5 $as_echo_n "checking whether readline via \"$_combo\" is present and sane... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include <stdio.h> #include <readline/readline.h> @@ -2679,7 +2679,7 @@ rs1scan(IOBUF *iop, struct recmatch *recm, SCANSTATE *state) do { if (*bp == rs) found = 1; - if (is_valid_character(*bp)) + if (is_valid_character((unsigned char)*bp)) mbclen = 1; else mbclen = mbrlen(bp, len, &mbs); diff --git a/m4/ChangeLog b/m4/ChangeLog index ac4b5368..26d81c7e 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +Tue Jan 4 11:09:43 2011 Arnold D. Robbins <arnold@skeeve.com> + + * readline.m4: Really fixed to work correctly with Autoconf 2.68. + Sat Dec 25 21:40:25 2010 Arnold D. Robbins <arnold@skeeve.com> * readline.m4: Fixed to work correctly with Autoconf 2.68. diff --git a/m4/readline.m4 b/m4/readline.m4 index 2138d28a..9550d997 100644 --- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -30,8 +30,8 @@ AC_DEFUN([GNUPG_CHECK_READLINE], AC_MSG_CHECKING([whether readline via \"$_combo\" is present and sane]) - AC_LINK_IFELSE([ AC_LANG([C]) + AC_LINK_IFELSE([ AC_LANG_PROGRAM([ #include <stdio.h> #include <readline/readline.h> diff --git a/pc/ChangeLog b/pc/ChangeLog index e616ad28..b6d7be83 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 4 11:20:40 2011 Arnold Robbins <arnold@skeeve.com> + + * config.h: Add PIPES_SIMULATED and definition of _NFILE for + DJGPP. + Sat Dec 18 22:12:42 2010 Arnold Robbins <arnold@skeeve.com> * gawkw32.def: Removed. diff --git a/pc/config.h b/pc/config.h index 04ab519d..a7bd593c 100644 --- a/pc/config.h +++ b/pc/config.h @@ -527,3 +527,9 @@ #endif /* #define NO_LINT 1 */ +#if defined(__DJGPP__) /* || defined(__MINGW32__) ??? */ +#define PIPES_SIMULATED 1 +#ifndef _NFILE +#define _NFILE 40 +#endif +#endif @@ -635,8 +635,6 @@ add_char(char **bufp, size_t *lenp, char ch, char **ptr) static char * expand_range(char *s, size_t *lenp) { - int i; - int found = FALSE; char *sp, *sp2, *newbuf; size_t len; int count = 0; |