Merge: Integer signedness and overflow and related fixes.

Fixes: debbugs:9079

2 files changed, 7 insertions, 8 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 087f006b88b..edbd1a1c1d4 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume freestanding C89 headers, string.h, stdlib.h.
+        * config.nt (HAVE_LIMITS_H, HAVE_STRING_H, HAVE_STDLIB_H)
+        (STDC_HEADERS): Remove.
+        Iinclude string.h, stdlib.h unconditionally.
+
 2011-06-07  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/stdint.h (INT32_MAX, INT64_MAX, INTPTR_MAX, PTRDIFF_MAX)
diff --git a/nt/config.nt b/nt/config.nt
index 2ba76df4446..3436bc989e0 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -131,12 +131,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef HAVE_LINUX_VERSION_H
 #undef HAVE_SYS_SYSTEMINFO_H
 #undef HAVE_TERMIOS_H
-#undef HAVE_LIMITS_H
-#undef HAVE_STRING_H
 #undef HAVE_STRINGS_H
-#undef HAVE_STDLIB_H
 #undef HAVE_PWD_H
-#undef STDC_HEADERS
 
 #undef HAVE_LIBDNET
 #undef HAVE_LIBPTHREADS
@@ -506,15 +502,11 @@ extern char *getenv ();
 #define PROTOTYPES 1
 #endif
 
-#ifdef HAVE_STRING_H
 #include "string.h"
-#endif
 #ifdef HAVE_STRINGS_H
 #include "strings.h"
 #endif
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 
 #ifndef NO_RETURN
 #if defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR >= 5))