(HAVE_STRINGS_H, HAVE_STDLIB_H): Undefine.

(strings.h, stdlib.h): Conditionally include.
(w32_abort): Declare here.
(abort): Redefine to w32_abort (moved from src/s/ms-w32.h).

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 7eeb5338b3cd97cdf232f681ecfe7f1d61a104fa..7977b07478cf4c2941131346fe536faed657906c 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-22  Jason Rumney  <jasonr@gnu.org>
+
+       * config.nt (HAVE_STRINGS_H, HAVE_STDLIB_H): Undefine.
+       (strings.h, stdlib.h): Conditionally include.
+       (w32_abort): Declare here.
+       (abort): Redefine to w32_abort (moved from src/s/ms-w32.h).
+
 2007-10-20  Jason Rumney  <jasonr@gnu.org>
 
        * makefile.w32-in (info-nmake): Change into correct directories.

diff --git a/nt/config.nt b/nt/config.nt
index fb33f2797c7310eb98611c6aa6b183da6caf6b92..30dd5be550b15262edad389743f5914eb66e5824 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -140,6 +140,8 @@ Boston, MA 02110-1301, USA.  */
 #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 TIME_WITH_SYS_TIME
@@ -469,6 +471,12 @@ extern char *getenv ();
 #ifdef HAVE_STRING_H
 #include "string.h"
 #endif
+#ifdef HAVE_STRINGS_H
+#include "strings.h"
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 #endif
 
 #ifndef NO_RETURN
@@ -479,5 +487,13 @@ extern char *getenv ();
 #endif
 #endif
 
+/* Redefine abort.  */
+#ifndef NOT_C_CODE
+#ifdef HAVE_NTGUI
+#define abort  w32_abort
+void w32_abort (void) NO_RETURN;
+#endif
+#endif
+
 /* arch-tag: df720992-aa5a-499a-882d-958dc5eeb5e9
    (do not change this comment) */