From ea78b8829899bfd61f9a495fca198efdd797ef50 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 22 Jan 2013 17:47:44 -0800 Subject: [PATCH] Merge from gnulib. --- ChangeLog | 5 +++++ lib/unistd.in.h | 20 ++------------------ src/unexmacosx.c | 2 +- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02a0453b9ec..15b32524026 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-01-23 Paul Eggert + + Merge from gnulib, incorporating: + 2013-01-16 unistd: port to recent mingw + 2013-01-19 Glenn Morris * Makefile.in (install-arch-indep): Put back a chmod that was diff --git a/lib/unistd.in.h b/lib/unistd.in.h index f011b71d5f5..a870fe7b4a3 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -14,29 +14,13 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . */ +#ifndef _@GUARD_PREFIX@_UNISTD_H + #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ -/* Special invocation convention: - - On mingw, several headers, including , include , - but we need to ensure that both the system and - are completely included before we replace gethostname. */ -#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \ - && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H -/* is being indirectly included for the first time from - ; avoid declaring any overrides. */ -# if @HAVE_UNISTD_H@ -# @INCLUDE_NEXT@ @NEXT_UNISTD_H@ -# else -# error unexpected; report this to bug-gnulib@gnu.org -# endif -# define _GL_WINSOCK2_H_WITNESS - -/* Normal invocation. */ -#elif !defined _@GUARD_PREFIX@_UNISTD_H - /* The include_next requires a split double-inclusion guard. */ #if @HAVE_UNISTD_H@ # @INCLUDE_NEXT@ @NEXT_UNISTD_H@ diff --git a/src/unexmacosx.c b/src/unexmacosx.c index 8d4e636fa5c..bec1d0a1b04 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -437,7 +437,7 @@ build_region_list (void) } -#define MAX_UNEXEC_REGIONS 400 +#define MAX_UNEXEC_REGIONS 800 static int num_unexec_regions; typedef struct { -- 2.39.2