upstream

3 files changed, 8 insertions, 4 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 9fc7ce3e33d..47963edecab 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -61,8 +61,6 @@ SYSTEM_TYPE
 ** Misc macros
 USER_FULL_NAME   If defined, overrides the default pw->pw_gecos for getting at the full user name.  Only MSDOS overrides the default.
 
-** Replace, the definition is trivial: SWITCH_ENUM_CAST
-
 ** Defines from src/s/*.h.  Some of these might not be used in the code anymore, so they can be removed.  The HAVE_* definitions are probably handled by autoconf, so it might be possible to just remove them from src/s/*.h.
 
 
diff --git a/admin/ChangeLog b/admin/ChangeLog
index b4c88c20ed1..d97e7dde32d 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use Gnulib environ and stdalign modules (Bug#9772, Bug#9960).
+        * merge-gnulib: Add environ, stdalign.
+
 2012-07-20  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * coccinelle/unibyte_string.cocci: Semantic patch to convert from
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 727b701cfe0..49d194c8033 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -28,11 +28,12 @@ GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
 GNULIB_MODULES='
   alloca-opt c-strcase
   careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
-  dtoastr dtotimespec dup2
+  dtoastr dtotimespec dup2 environ
   filemode getloadavg getopt-gnu gettime gettimeofday
   ignore-value intprops largefile lstat
   manywarnings mktime pselect pthread_sigmask readlink
-  socklen stat-time stdarg stdio strftime strtoimax strtoumax symlink sys_stat
+  socklen stat-time stdalign stdarg stdio
+  strftime strtoimax strtoumax symlink sys_stat
   sys_time time timespec-add timespec-sub utimens
   warnings
 '