summaryrefslogtreecommitdiffstats
path: root/gettext-tools/woe32dll
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2012-12-25 09:37:54 +0900
committerDaiki Ueno <ueno@gnu.org>2012-12-25 09:37:54 +0900
commit6e1d0603cd3522b8e44b7bdb2bd58be7f0c6ef71 (patch)
tree05c21b89627e978bc83261e6811294841d4b762b /gettext-tools/woe32dll
parent4f4bbf1d7ddb94774c35ce85b1c011c86bd4dd7c (diff)
downloadexternal_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 'gettext-tools/woe32dll')
-rw-r--r--gettext-tools/woe32dll/gettextlib-exports.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/gettext-tools/woe32dll/gettextlib-exports.c b/gettext-tools/woe32dll/gettextlib-exports.c
index a627e1d..0f1c33f 100644
--- a/gettext-tools/woe32dll/gettextlib-exports.c
+++ b/gettext-tools/woe32dll/gettextlib-exports.c
@@ -18,9 +18,11 @@
#include "woe32dll/export.h"
VARIABLE(argmatch_die)
-VARIABLE(error_message_count)
-VARIABLE(error_one_per_line)
-VARIABLE(error_print_progname)
+#if GNULIB_DEFINED_ERROR
+VARIABLE(rpl_error_message_count)
+VARIABLE(rpl_error_one_per_line)
+VARIABLE(rpl_error_print_progname)
+#endif
VARIABLE(error_with_progname)
VARIABLE(exit_failure)
VARIABLE(gl_array_list_implementation)