Commit ea78b882 authored by Paul Eggert's avatar Paul Eggert

Merge from gnulib.

parent 9d93ce29
2013-01-23 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-01-16 unistd: port to recent mingw
2013-01-19 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-arch-indep): Put back a chmod that was
......
......@@ -14,29 +14,13 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifndef _@GUARD_PREFIX@_UNISTD_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
@PRAGMA_COLUMNS@
/* Special invocation convention:
- On mingw, several headers, including <winsock2.h>, include <unistd.h>,
but we need to ensure that both the system <unistd.h> and <winsock2.h>
are completely included before we replace gethostname. */
#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
&& !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
/* <unistd.h> is being indirectly included for the first time from
<winsock2.h>; 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@
......
......@@ -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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment