summaryrefslogtreecommitdiffstats
path: root/gnulib-local
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2013-02-25 19:02:15 +0900
committerDaiki Ueno <ueno@gnu.org>2013-02-25 19:02:40 +0900
commit221dee0ccd9fde7603e71c470e665d8e448a0728 (patch)
tree481fb9dc3321da85f5a547ec3bb7021d5b7cb125 /gnulib-local
parent87a885f02321682e9e6bf63346c8796c6666f2d1 (diff)
downloadexternal_gettext-221dee0ccd9fde7603e71c470e665d8e448a0728.zip
external_gettext-221dee0ccd9fde7603e71c470e665d8e448a0728.tar.gz
external_gettext-221dee0ccd9fde7603e71c470e665d8e448a0728.tar.bz2
Update after gnulib changed.
Diffstat (limited to 'gnulib-local')
-rw-r--r--gnulib-local/ChangeLog5
-rw-r--r--gnulib-local/lib/unistd.in.h.diff8
2 files changed, 9 insertions, 4 deletions
diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 8d7e543..bc9b24e 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,5 +1,10 @@
2013-02-25 Daiki Ueno <ueno@gnu.org>
+ Update after gnulib changed.
+ * lib/unistd.in.h.diff: Update.
+
+2013-02-25 Daiki Ueno <ueno@gnu.org>
+
* modules/gettext-runtime-misc (AM_CPPFLAGS): Augment by
INTL_EXPORTS_FLAGS.
diff --git a/gnulib-local/lib/unistd.in.h.diff b/gnulib-local/lib/unistd.in.h.diff
index db12e64..3bd5fa6 100644
--- a/gnulib-local/lib/unistd.in.h.diff
+++ b/gnulib-local/lib/unistd.in.h.diff
@@ -1,6 +1,6 @@
---- 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 @@
+--- unistd.in.h.orig 2013-02-25 18:40:16.000000000 +0900
++++ unistd.in.h 2013-02-25 18:49:26.754601400 +0900
+@@ -109,7 +109,11 @@
/* Get getopt(), optarg, optind, opterr, optopt.
But avoid namespace pollution on glibc systems. */
@@ -10,6 +10,6 @@
+ 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
+ # define __need_getopt
# include <getopt.h>
#endif
-