[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111585: Merge from gnulib.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111585: Merge from gnulib. |
Date: |
Tue, 22 Jan 2013 17:47:44 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111585
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2013-01-22 17:47:44 -0800
message:
Merge from gnulib.
modified:
ChangeLog
lib/unistd.in.h
src/unexmacosx.c
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-01-19 20:38:13 +0000
+++ b/ChangeLog 2013-01-23 01:47:44 +0000
@@ -1,3 +1,8 @@
+2013-01-23 Paul Eggert <address@hidden>
+
+ Merge from gnulib, incorporating:
+ 2013-01-16 unistd: port to recent mingw
+
2013-01-19 Glenn Morris <address@hidden>
* Makefile.in (install-arch-indep): Put back a chmod that was
=== modified file 'lib/unistd.in.h'
--- a/lib/unistd.in.h 2013-01-10 02:19:44 +0000
+++ b/lib/unistd.in.h 2013-01-23 01:47:44 +0000
@@ -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 address@hidden@_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 address@hidden
-# endif
-# define _GL_WINSOCK2_H_WITNESS
-
-/* Normal invocation. */
-#elif !defined address@hidden@_UNISTD_H
-
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_UNISTD_H@
# @INCLUDE_NEXT@ @NEXT_UNISTD_H@
=== modified file 'src/unexmacosx.c'
--- a/src/unexmacosx.c 2013-01-01 09:11:05 +0000
+++ b/src/unexmacosx.c 2013-01-23 01:47:44 +0000
@@ -437,7 +437,7 @@
}
-#define MAX_UNEXEC_REGIONS 400
+#define MAX_UNEXEC_REGIONS 800
static int num_unexec_regions;
typedef struct {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111585: Merge from gnulib.,
Paul Eggert <=