diff options
| author | Daiki Ueno <ueno@gnu.org> | 2012-12-25 09:37:54 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2012-12-25 09:37:54 +0900 |
| commit | 6e1d0603cd3522b8e44b7bdb2bd58be7f0c6ef71 (patch) | |
| tree | 05c21b89627e978bc83261e6811294841d4b762b /gnulib-local | |
| parent | 4f4bbf1d7ddb94774c35ce85b1c011c86bd4dd7c (diff) | |
| download | external_gettext-6e1d0603cd3522b8e44b7bdb2bd58be7f0c6ef71.zip external_gettext-6e1d0603cd3522b8e44b7bdb2bd58be7f0c6ef71.tar.gz external_gettext-6e1d0603cd3522b8e44b7bdb2bd58be7f0c6ef71.tar.bz2 | |
Work around error_* symbol conflict with Cygwin 1.7 DLL.
Diffstat (limited to 'gnulib-local')
| -rw-r--r-- | gnulib-local/ChangeLog | 6 | ||||
| -rw-r--r-- | gnulib-local/lib/error.h.diff | 26 |
2 files changed, 28 insertions, 4 deletions
diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 767f6ad..fd4c106 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,3 +1,9 @@ +2012-12-25 Daiki Ueno <ueno@gnu.org> + + Work around error_* symbol conflict with Cygwin 1.7 DLL. + * lib/error.h.diff: Rename the error_* symbol if + GNULIB_REPLACE_ERROR is defined. + 2012-12-12 Daiki Ueno <ueno@unixuser.org> Add notice about included external libraries. diff --git a/gnulib-local/lib/error.h.diff b/gnulib-local/lib/error.h.diff index e9f6130..5b82f22 100644 --- a/gnulib-local/lib/error.h.diff +++ b/gnulib-local/lib/error.h.diff @@ -1,7 +1,25 @@ -*** gnulib/lib/error.h 2005-05-14 08:03:58.000000000 +0200 ---- srclib/error.h 2005-05-20 23:06:02.000000000 +0200 +*** gnulib/lib/error.h 2012-12-24 20:10:43.000000000 +0900 +--- srclib/error.h 2012-12-24 20:08:16.000000000 +0900 *************** -*** 50,63 **** +*** 31,36 **** +--- 31,45 ---- + # define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ + #endif + ++ #if GNULIB_REPLACE_ERROR ++ # undef error_print_progname ++ # undef error_message_count ++ # undef error_one_per_line ++ # define error_print_progname rpl_error_print_progname ++ # define error_message_count rpl_error_message_count ++ # define error_one_per_line rpl_error_one_per_line ++ #endif ++ + #ifdef __cplusplus + extern "C" { + #endif +*************** +*** 49,62 **** /* If NULL, error will flush stdout, then print on stderr the program name, a colon and a space. Otherwise, error will call this function without parameters instead. */ @@ -16,7 +34,7 @@ #ifdef __cplusplus } ---- 50,63 ---- +--- 58,71 ---- /* If NULL, error will flush stdout, then print on stderr the program name, a colon and a space. Otherwise, error will call this function without parameters instead. */ |