From: Bruno Haible <bruno@clisp.org>
Date: Sat, 24 Mar 2018 14:04:11 +0000 (+0100)
Subject: Update after gnulib changed.
X-Git-Tag: v0.20~418
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ceb6b400af375364a7e487cc8bf9bc9887435d7;p=thirdparty%2Fgettext.git

Update after gnulib changed.

* gnulib-local/lib/unistd.in.h.diff: Update.
* gnulib-local/lib/regexec.c.diff: Remove file.
* gnulib-local/Makefile.am (EXTRA_DIST): Remove it.
---

diff --git a/.gitignore b/.gitignore
index 8db6ed74a..dcf27e2ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,6 +77,8 @@
 /gettext-tools/libgettextpo/c-strstr.c
 /gettext-tools/libgettextpo/c-strstr.h
 /gettext-tools/libgettextpo/c++defs.h
+/gettext-tools/libgettextpo/cloexec.c
+/gettext-tools/libgettextpo/cloexec.h
 /gettext-tools/libgettextpo/close.c
 /gettext-tools/libgettextpo/concat-filename.c
 /gettext-tools/libgettextpo/concat-filename.h
@@ -85,6 +87,7 @@
 /gettext-tools/libgettextpo/dirname-lgpl.c
 /gettext-tools/libgettextpo/dirname.h
 /gettext-tools/libgettextpo/dosname.h
+/gettext-tools/libgettextpo/dup2.c
 /gettext-tools/libgettextpo/errno.in.h
 /gettext-tools/libgettextpo/error-progname.c
 /gettext-tools/libgettextpo/error-progname.h
@@ -92,6 +95,7 @@
 /gettext-tools/libgettextpo/error.h
 /gettext-tools/libgettextpo/exitfail.c
 /gettext-tools/libgettextpo/exitfail.h
+/gettext-tools/libgettextpo/fcntl.c
 /gettext-tools/libgettextpo/fcntl.in.h
 /gettext-tools/libgettextpo/fd-hook.c
 /gettext-tools/libgettextpo/fd-hook.h
@@ -110,6 +114,7 @@
 /gettext-tools/libgettextpo/gcd.c
 /gettext-tools/libgettextpo/gcd.h
 /gettext-tools/libgettextpo/getdelim.c
+/gettext-tools/libgettextpo/getdtablesize.c
 /gettext-tools/libgettextpo/getline.c
 /gettext-tools/libgettextpo/getprogname.c
 /gettext-tools/libgettextpo/getprogname.h
@@ -180,9 +185,12 @@
 /gettext-tools/libgettextpo/ref-del.sin
 /gettext-tools/libgettextpo/relocatable.c
 /gettext-tools/libgettextpo/relocatable.h
+/gettext-tools/libgettextpo/relocatable.valgrind
 /gettext-tools/libgettextpo/signal.in.h
 /gettext-tools/libgettextpo/sigprocmask.c
 /gettext-tools/libgettextpo/size_max.h
+/gettext-tools/libgettextpo/stat-time.c
+/gettext-tools/libgettextpo/stat-time.h
 /gettext-tools/libgettextpo/stat-w32.c
 /gettext-tools/libgettextpo/stat-w32.h
 /gettext-tools/libgettextpo/stat.c
diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 50d6396ae..91094ea01 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gnulib-local directory of GNU gettext
-## Copyright (C) 2006-2008, 2010-2011, 2015-2017 Free Software Foundation, Inc.
+## Copyright (C) 2006-2008, 2010-2011, 2015-2018 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -233,7 +233,6 @@ lib/obstack.h.diff \
 lib/ostream.oo.c \
 lib/ostream.oo.h \
 lib/progname.h.diff \
-lib/regexec.c.diff \
 lib/regex_internal.h.diff \
 lib/spawn-pipe.c.diff \
 lib/styled-ostream.oo.c \
diff --git a/gnulib-local/lib/regexec.c.diff b/gnulib-local/lib/regexec.c.diff
deleted file mode 100644
index eede89671..000000000
--- a/gnulib-local/lib/regexec.c.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-*** lib/regexec.c.orig	Mon May 24 12:36:55 2010
---- lib/regexec.c	Mon May 24 12:34:41 2010
-***************
-*** 3425,3431 ****
-    else
-      {
-        dest_states = (re_dfastate_t **)
-! 	malloc (ndests * 3 * sizeof (re_dfastate_t *));
-        if (BE (dest_states == NULL, 0))
-  	{
-  out_free:
---- 3425,3431 ----
-    else
-      {
-        dest_states = (re_dfastate_t **)
-! 	re_malloc (re_dfastate_t *, ndests * 3);
-        if (BE (dest_states == NULL, 0))
-  	{
-  out_free:
diff --git a/gnulib-local/lib/unistd.in.h.diff b/gnulib-local/lib/unistd.in.h.diff
index ebde7d3b8..5c131cdb5 100644
--- a/gnulib-local/lib/unistd.in.h.diff
+++ b/gnulib-local/lib/unistd.in.h.diff
@@ -1,15 +1,14 @@
 --- unistd.in.h	2017-05-15 19:05:30.449063823 +0200
 +++ unistd.in.h.new	2017-05-15 19:14:39.145268786 +0200
-@@ -136,7 +136,11 @@
+@@ -136,6 +136,10 @@
  
- /* Get getopt(), optarg, optind, opterr, optopt.
-    But avoid namespace pollution on glibc systems.  */
--#if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
+ /* Get getopt(), optarg, optind, opterr, optopt.  */
+-#if @GNULIB_UNISTD_H_GETOPT@ && !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
++#if @GNULIB_UNISTD_H_GETOPT@ && !defined GTPO_CONFIG_H && !defined _GL_SYSTEM_GETOPT
  # include <getopt-cdefs.h>
  # include <getopt-pfx-core.h>
  #endif