From f7d3edbbf90b2be03a404fa76a2df1d2bd0d7e33 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 26 Jan 2012 15:53:13 +0100 Subject: [PATCH] Update after gnulib changed. --- gnulib-local/ChangeLog | 9 +++++++++ gnulib-local/lib/argmatch.h.diff | 4 ++-- gnulib-local/lib/error.h.diff | 4 ++-- gnulib-local/lib/fnmatch_loop.c.diff | 4 ++-- gnulib-local/lib/getopt.in.h.diff | 12 ++++++------ gnulib-local/lib/obstack.h.diff | 4 ++-- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 38e810878..ec25bf049 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,3 +1,12 @@ +2012-01-06 Bruno Haible + + Update after gnulib changed. + * lib/argmatch.h.diff: Update. + * lib/error.h.diff: Update. + * lib/fnmatch_loop.c.diff: Update. + * lib/getopt.in.h.diff: Update. + * lib/obstack.h.diff: Update. + 2011-10-18 Daniel Richard G. (tiny change) Support for old NeXTstep 3.3 gcc. diff --git a/gnulib-local/lib/argmatch.h.diff b/gnulib-local/lib/argmatch.h.diff index f47572c4f..924e5dd12 100644 --- a/gnulib-local/lib/argmatch.h.diff +++ b/gnulib-local/lib/argmatch.h.diff @@ -3,7 +3,7 @@ *************** *** 50,56 **** return. By default, this is a function that calls ARGMATCH_DIE which - in turn defaults to `exit (exit_failure)'. */ + in turn defaults to 'exit (exit_failure)'. */ typedef void (*argmatch_exit_fn) (void); ! extern argmatch_exit_fn argmatch_die; @@ -11,7 +11,7 @@ --- 50,56 ---- return. By default, this is a function that calls ARGMATCH_DIE which - in turn defaults to `exit (exit_failure)'. */ + in turn defaults to 'exit (exit_failure)'. */ typedef void (*argmatch_exit_fn) (void); ! extern DLL_VARIABLE argmatch_exit_fn argmatch_die; diff --git a/gnulib-local/lib/error.h.diff b/gnulib-local/lib/error.h.diff index 069df8d6e..e9f61301b 100644 --- a/gnulib-local/lib/error.h.diff +++ b/gnulib-local/lib/error.h.diff @@ -7,7 +7,7 @@ function without parameters instead. */ ! extern void (*error_print_progname) (void); - /* This variable is incremented each time `error' is called. */ + /* This variable is incremented each time 'error' is called. */ ! extern unsigned int error_message_count; /* Sometimes we want to have at most one error per line. This @@ -22,7 +22,7 @@ function without parameters instead. */ ! extern DLL_VARIABLE void (*error_print_progname) (void); - /* This variable is incremented each time `error' is called. */ + /* This variable is incremented each time 'error' is called. */ ! extern DLL_VARIABLE unsigned int error_message_count; /* Sometimes we want to have at most one error per line. This diff --git a/gnulib-local/lib/fnmatch_loop.c.diff b/gnulib-local/lib/fnmatch_loop.c.diff index 75c610f3d..1683a1433 100644 --- a/gnulib-local/lib/fnmatch_loop.c.diff +++ b/gnulib-local/lib/fnmatch_loop.c.diff @@ -153,7 +153,7 @@ case L_('@'): do -! /* I cannot believe it but `strcat' is actually acceptable +! /* I cannot believe it but 'strcat' is actually acceptable ! here. Match the entire string with the prefix from the ! pattern list and the rest of the pattern following the ! pattern list. */ @@ -199,7 +199,7 @@ ! { ! struct patternlist *next; ! -! /* I cannot believe it but `strcat' is actually acceptable +! /* I cannot believe it but 'strcat' is actually acceptable ! here. Match the entire string with the prefix from the ! pattern list and the rest of the pattern following the ! pattern list. */ diff --git a/gnulib-local/lib/getopt.in.h.diff b/gnulib-local/lib/getopt.in.h.diff index 573321d2c..3504f564e 100644 --- a/gnulib-local/lib/getopt.in.h.diff +++ b/gnulib-local/lib/getopt.in.h.diff @@ -19,7 +19,7 @@ defined in this header. When this happens, include the *************** *** 111,117 **** - Also, when `ordering' is RETURN_IN_ORDER, + Also, when 'ordering' is RETURN_IN_ORDER, each non-option ARGV-element is returned here. */ ! extern char *optarg; @@ -27,7 +27,7 @@ /* Index in ARGV of the next element to be scanned. This is used for communication to and from the caller --- 119,125 ---- - Also, when `ordering' is RETURN_IN_ORDER, + Also, when 'ordering' is RETURN_IN_ORDER, each non-option ARGV-element is returned here. */ ! extern DLL_VARIABLE char *optarg; @@ -36,12 +36,12 @@ This is used for communication to and from the caller *************** *** 125,140 **** - Otherwise, `optind' communicates from one call to the next + Otherwise, 'optind' communicates from one call to the next how much of ARGV has been scanned so far. */ ! extern int optind; - /* Callers store zero here to inhibit the error message `getopt' prints + /* Callers store zero here to inhibit the error message 'getopt' prints for unrecognized options. */ ! extern int opterr; @@ -53,12 +53,12 @@ #ifndef __need_getopt /* Describe the long-named options requested by the application. --- 133,148 ---- - Otherwise, `optind' communicates from one call to the next + Otherwise, 'optind' communicates from one call to the next how much of ARGV has been scanned so far. */ ! extern DLL_VARIABLE int optind; - /* Callers store zero here to inhibit the error message `getopt' prints + /* Callers store zero here to inhibit the error message 'getopt' prints for unrecognized options. */ ! extern DLL_VARIABLE int opterr; diff --git a/gnulib-local/lib/obstack.h.diff b/gnulib-local/lib/obstack.h.diff index e64e1db04..ae294b5a1 100644 --- a/gnulib-local/lib/obstack.h.diff +++ b/gnulib-local/lib/obstack.h.diff @@ -7,7 +7,7 @@ return. The default action is to print a message and abort. */ ! extern void (*obstack_alloc_failed_handler) (void); - /* Exit value used when `print_and_abort' is used. */ + /* Exit value used when 'print_and_abort' is used. */ ! extern int obstack_exit_failure; /* Pointer to beginning of object being allocated or to be allocated next. @@ -18,7 +18,7 @@ return. The default action is to print a message and abort. */ ! extern DLL_VARIABLE void (*obstack_alloc_failed_handler) (void); - /* Exit value used when `print_and_abort' is used. */ + /* Exit value used when 'print_and_abort' is used. */ ! extern DLL_VARIABLE int obstack_exit_failure; /* Pointer to beginning of object being allocated or to be allocated next. -- 2.47.2