[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111465: Merge from gnulib.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111465: Merge from gnulib. |
Date: |
Wed, 09 Jan 2013 18:19:44 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111465
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2013-01-09 18:19:44 -0800
message:
Merge from gnulib.
modified:
ChangeLog
lib/getopt.in.h
lib/stdlib.in.h
lib/unistd.in.h
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-01-04 19:22:37 +0000
+++ b/ChangeLog 2013-01-10 02:19:44 +0000
@@ -1,3 +1,8 @@
+2013-01-10 Paul Eggert <address@hidden>
+
+ Merge from gnulib, incorporating:
+ 2013-01-09 stdlib: port to Solaris 2.6
+
2013-01-04 Glenn Morris <address@hidden>
* info/dir: Add htmlfontify.
=== modified file 'lib/getopt.in.h'
--- a/lib/getopt.in.h 2013-01-01 09:11:05 +0000
+++ b/lib/getopt.in.h 2013-01-10 02:19:44 +0000
@@ -49,7 +49,9 @@
linkers. */
#if defined __GETOPT_PREFIX && !defined __need_getopt
# if address@hidden@
+# define __need_system_stdlib_h
# include <stdlib.h>
+# undef __need_system_stdlib_h
# include <stdio.h>
# include <unistd.h>
# endif
=== modified file 'lib/stdlib.in.h'
--- a/lib/stdlib.in.h 2013-01-01 09:11:05 +0000
+++ b/lib/stdlib.in.h 2013-01-10 02:19:44 +0000
@@ -20,8 +20,9 @@
#endif
@PRAGMA_COLUMNS@
-#if defined __need_malloc_and_calloc
-/* Special invocation convention inside glibc header files. */
+#if defined __need_system_stdlib_h || defined __need_malloc_and_calloc
+/* Special invocation conventions inside some gnulib header files,
+ and inside some glibc header files, respectively. */
address@hidden@ @NEXT_STDLIB_H@
=== modified file 'lib/unistd.in.h'
--- a/lib/unistd.in.h 2013-01-02 16:37:04 +0000
+++ b/lib/unistd.in.h 2013-01-10 02:19:44 +0000
@@ -79,7 +79,9 @@
/* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>. */
/* But avoid namespace pollution on glibc systems. */
#ifndef __GLIBC__
+# define __need_system_stdlib_h
# include <stdlib.h>
+# undef __need_system_stdlib_h
#endif
/* Native Windows platforms declare chdir, getcwd, rmdir in
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111465: Merge from gnulib.,
Paul Eggert <=