auto upstream

3 files changed, 9 insertions, 8 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 20c97f886dd..b71102960e6 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -419,14 +419,7 @@ PTY_TTY_NAME_SPRINTF
 PURESIZE
 RUN_TIME_REMAP
 SETUP_SLAVE_PTY
-SIGALRM
-SIGCHLD
-SIGHUP
-SIGKILL
 SIGNALS_VIA_CHARACTERS
-SIGPIPE
-SIGQUIT
-SIGTRAP
 STDC_HEADERS
 SYSTEM_PURESIZE_EXTRA
 SYSTEM_MALLOC
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 05c1463d325..840c38aeb94 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume POSIX 1003.1-1988 or later for signal.h (Bug#13026).
+        * CPP-DEFINES (SIGALRM, SIGCHLD, SIGHUP, SIGKILL, SIGPIPE, SIGQUIT):
+        Remove.
+        (SIGTRAP): Remove this one too, as config.h no longer defines it.
+        * merge-gnulib (GNULIB_MODULES): Add sig2str.
+
 2012-11-24  Ken Brown  <kbrown@cornell.edu>
 
         * CPP-DEFINES (HAVE_MOUSE): Remove.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 792818b2efe..75e7ec6b000 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -32,7 +32,7 @@ GNULIB_MODULES='
   fcntl-h filemode getloadavg getopt-gnu gettime gettimeofday
   ignore-value intprops largefile lstat
   manywarnings mktime pselect pthread_sigmask readlink
-  socklen stat-time stdalign stdarg stdbool stdio
+  sig2str socklen stat-time stdalign stdarg stdbool stdio
   strftime strtoimax strtoumax symlink sys_stat
   sys_time time timer-time timespec-add timespec-sub utimens
   warnings