Merge from gnulib.

diff --git a/ChangeLog b/ChangeLog
index a6d5148c777639e483d0146f3714f8e58f3e562d..ba756946c56c074ddf99b8a478056a50df11f97d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib, incorporating:
+       2013-01-09 stdlib: port to Solaris 2.6
+
 2013-01-04  Glenn Morris  <rgm@gnu.org>
 
        * info/dir: Add htmlfontify.

diff --git a/lib/getopt.in.h b/lib/getopt.in.h
index 490994f860f4301583c0071623dedffafc7bfa2c..d9c7d8144aea2af4580a6f0b6f9ce283176578bb 100644 (file)
--- a/lib/getopt.in.h
+++ b/lib/getopt.in.h
@@ -49,7 +49,9 @@
    linkers.  */
 #if defined __GETOPT_PREFIX && !defined __need_getopt
 # if !@HAVE_GETOPT_H@
+#  define __need_system_stdlib_h
 #  include <stdlib.h>
+#  undef __need_system_stdlib_h
 #  include <stdio.h>
 #  include <unistd.h>
 # endif

diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index 3b3b4b1bd437f296dad69a405339376546aa4bad..422ad714c32e6c9fca879e488b9dc8cd9f323c78 100644 (file)
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -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.  */
 
 #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
 

diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 5127eecd603c57ccca8fae75fdfad17ab1ea84a8..f011b71d5f544d42d03a567c6a85e4126eb26733 100644 (file)
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -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