summaryrefslogtreecommitdiffstats
path: root/gnulib-local/lib
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2010-05-09 10:54:02 +0200
committerBruno Haible <bruno@clisp.org>2010-05-09 12:54:19 +0200
commitf648e515af28437aff5ee870828df5ba43fa2822 (patch)
tree2a3cfe1ef75a7585b00dc07b4ae26234e9bc808d /gnulib-local/lib
parent631ba959695f031580908d1963477cf5d3caaa27 (diff)
downloadexternal_gettext-f648e515af28437aff5ee870828df5ba43fa2822.zip
external_gettext-f648e515af28437aff5ee870828df5ba43fa2822.tar.gz
external_gettext-f648e515af28437aff5ee870828df5ba43fa2822.tar.bz2
Avoid compilation error in libgettextpo directory on Solaris 8.
Diffstat (limited to 'gnulib-local/lib')
-rw-r--r--gnulib-local/lib/unistd.in.h.diff15
1 files changed, 15 insertions, 0 deletions
diff --git a/gnulib-local/lib/unistd.in.h.diff b/gnulib-local/lib/unistd.in.h.diff
new file mode 100644
index 0000000..db12e64
--- /dev/null
+++ b/gnulib-local/lib/unistd.in.h.diff
@@ -0,0 +1,15 @@
+--- unistd.in.h.orig 2010-05-09 02:37:27.000000000 +0200
++++ unistd.in.h 2010-05-09 10:51:25.000000000 +0200
+@@ -93,7 +93,11 @@
+
+ /* Get getopt(), optarg, optind, opterr, optopt.
+ But avoid namespace pollution on glibc systems. */
+-#if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
++/* Also, don't include <getopt.h> inside libgettextpo, because we use
++ the getopt module only in gettext-tools/gnulib-lib/, not in
++ gettext-tools/libgettextpo/, but there is only a single
++ GNULIB_UNISTD_H_GETOPT variable for both. */
++#if @GNULIB_UNISTD_H_GETOPT@ && !defined GTPO_CONFIG_H && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
+ # include <getopt.h>
+ #endif
+