From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 20 Jan 2015 07:14:30 +0000 (+0900)
Subject: Update Gnulib
X-Git-Tag: v0.19.5~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e3f2cfbe27ccba5005393f5e4f4c96e56a07d4c;p=thirdparty%2Fgettext.git

Update Gnulib
---

diff --git a/gettext-tools/gnulib-tests/.gitignore b/gettext-tools/gnulib-tests/.gitignore
index dd37e616c..5d0b2301a 100644
--- a/gettext-tools/gnulib-tests/.gitignore
+++ b/gettext-tools/gnulib-tests/.gitignore
@@ -30,6 +30,7 @@
 /same-inode.h
 /signature.h
 /sleep.c
+/stdalign.in.h
 /stdio-impl.h
 /symlink.c
 /test-alignof.c
@@ -194,6 +195,7 @@
 /test-setlocale1.sh
 /test-setlocale2.c
 /test-setlocale2.sh
+/test-sh-quote.c
 /test-sigaction.c
 /test-signal-h.c
 /test-signal.c
@@ -208,6 +210,7 @@
 /test-spawn.c
 /test-stat.c
 /test-stat.h
+/test-stdalign.c
 /test-stdbool.c
 /test-stddef.c
 /test-stdint.c
@@ -229,6 +232,7 @@
 /test-sys_socket.c
 /test-sys_stat.c
 /test-sys_time.c
+/test-sys_types.c
 /test-sys_wait.c
 /test-sys_wait.h
 /test-term-ostream-xterm
@@ -285,6 +289,3 @@
 
 # Files generated by the autotools:
 /Makefile.in
-
-/test-sh-quote.c
-/test-sys_types.c
diff --git a/gnulib b/gnulib
index e5a15adc6..40023a310 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit e5a15adc6db466ae9d7ea5d892f78e0390d032d0
+Subproject commit 40023a310ff6a829ce145f80ecfae15f498fe1d8
diff --git a/gnulib-local/lib/unistd.in.h.diff b/gnulib-local/lib/unistd.in.h.diff
index b339c4def..f1d693713 100644
--- a/gnulib-local/lib/unistd.in.h.diff
+++ b/gnulib-local/lib/unistd.in.h.diff
@@ -1,5 +1,5 @@
 diff --git a/unistd.in.h b/unistd.in.h
-index b4a3f5b..dd0d2c2 100644
+index b82be83..9df3f13 100644
 --- a/unistd.in.h
 +++ b/unistd.in.h
 @@ -125,7 +125,11 @@
@@ -15,12 +15,3 @@ index b4a3f5b..dd0d2c2 100644
  # define __need_getopt
  # include <getopt.h>
  #endif
-@@ -402,7 +406,7 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - "
-    "VARIABLE=VALUE", terminated with a NULL.  */
- #  if defined __APPLE__ && defined __MACH__
- #   include <TargetConditionals.h>
--#   if !defined TARGET_OS_IPHONE && !defined TARGET_IPHONE_SIMULATOR
-+#   if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
- #    define _GL_USE_CRT_EXTERNS
- #   endif
- #  endif