comparison nt/config.nt @ 91073:4bc33ffdda1a

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 902-908) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 131-137) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 261-262) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author Miles Bader <miles@gnu.org>
date Sat, 27 Oct 2007 09:12:07 +0000
parents f55f9811f5d7 e589708fefc2
children 880960b70474
comparison
equal deleted inserted replaced
91072:74ab3ea909f9 91073:4bc33ffdda1a
138 #undef HAVE_LINUX_VERSION_H 138 #undef HAVE_LINUX_VERSION_H
139 #undef HAVE_SYS_SYSTEMINFO_H 139 #undef HAVE_SYS_SYSTEMINFO_H
140 #undef HAVE_TERMIOS_H 140 #undef HAVE_TERMIOS_H
141 #undef HAVE_LIMITS_H 141 #undef HAVE_LIMITS_H
142 #undef HAVE_STRING_H 142 #undef HAVE_STRING_H
143 #undef HAVE_STRINGS_H
144 #undef HAVE_STDLIB_H
143 #undef HAVE_PWD_H 145 #undef HAVE_PWD_H
144 #undef STDC_HEADERS 146 #undef STDC_HEADERS
145 #undef TIME_WITH_SYS_TIME 147 #undef TIME_WITH_SYS_TIME
146 148
147 #undef HAVE_LIBDNET 149 #undef HAVE_LIBDNET
467 /* Don't include <string.h> during configure. */ 469 /* Don't include <string.h> during configure. */
468 #ifndef NOT_C_CODE 470 #ifndef NOT_C_CODE
469 #ifdef HAVE_STRING_H 471 #ifdef HAVE_STRING_H
470 #include "string.h" 472 #include "string.h"
471 #endif 473 #endif
474 #ifdef HAVE_STRINGS_H
475 #include "strings.h"
476 #endif
477 #ifdef HAVE_STDLIB_H
478 #include <stdlib.h>
479 #endif
472 #endif 480 #endif
473 481
474 #ifndef NO_RETURN 482 #ifndef NO_RETURN
475 #if defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR >= 5)) 483 #if defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR >= 5))
476 #define NO_RETURN __attribute__ ((__noreturn__)) 484 #define NO_RETURN __attribute__ ((__noreturn__))
477 #else 485 #else
478 #define NO_RETURN /* nothing */ 486 #define NO_RETURN /* nothing */
479 #endif 487 #endif
480 #endif 488 #endif
481 489
490 /* Redefine abort. */
491 #ifndef NOT_C_CODE
492 #ifdef HAVE_NTGUI
493 #define abort w32_abort
494 void w32_abort (void) NO_RETURN;
495 #endif
496 #endif
497
482 /* arch-tag: df720992-aa5a-499a-882d-958dc5eeb5e9 498 /* arch-tag: df720992-aa5a-499a-882d-958dc5eeb5e9
483 (do not change this comment) */ 499 (do not change this comment) */