From: Daiki Ueno Date: Mon, 25 Feb 2013 10:02:15 +0000 (+0900) Subject: Update after gnulib changed. X-Git-Tag: v0.18.2.1~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ee2a787ff62ad8d99ef9ce67b755340025fedf8;p=thirdparty%2Fgettext.git Update after gnulib changed. --- diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 8d7e5432b..bc9b24e80 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,3 +1,8 @@ +2013-02-25 Daiki Ueno + + Update after gnulib changed. + * lib/unistd.in.h.diff: Update. + 2013-02-25 Daiki Ueno * modules/gettext-runtime-misc (AM_CPPFLAGS): Augment by diff --git a/gnulib-local/lib/unistd.in.h.diff b/gnulib-local/lib/unistd.in.h.diff index db12e6404..3bd5fa642 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 #endif -