diff options
| author | Glenn Morris | 2010-06-02 22:29:02 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-06-02 22:29:02 -0700 |
| commit | 0d4bcf4ddd512e29e414fe1b6f804dcbaa871e72 (patch) | |
| tree | a0e0d8200221c2572eaf63210057b1abe7212f27 /nt | |
| parent | dd2c3c9241142e3d8d855a25319467292a418072 (diff) | |
| download | emacs-0d4bcf4ddd512e29e414fe1b6f804dcbaa871e72.tar.gz emacs-0d4bcf4ddd512e29e414fe1b6f804dcbaa871e72.zip | |
NOT_C_CODE is always true now.
* configure.in (AH_BOTTOM): Remove NOT_C_CODE test, it is always true.
* m/ia64.h, s/gnu-linux.h, s/gnu.h, s/netbsd.h, s/usg5-4.h:
Remove NOT_C_CODE tests, it is always true now.
* nt/config.nt: Remove NOT_C_CODE tests, it is always true now.
* admin/CPP-DEFINES: Remove NOT_C_CODE.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/config.nt | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 6db0eb744c9..1f13c17cfb6 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-06-03 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * config.nt: Remove NOT_C_CODE tests, it is always true now. | ||
| 4 | |||
| 1 | 2010-05-13 Glenn Morris <rgm@gnu.org> | 5 | 2010-05-13 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs. | 7 | * config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs. |
diff --git a/nt/config.nt b/nt/config.nt index 7ec98fb7666..c2a933ecbce 100644 --- a/nt/config.nt +++ b/nt/config.nt | |||
| @@ -365,14 +365,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 365 | #ifndef WINDOWSNT | 365 | #ifndef WINDOWSNT |
| 366 | /* Some of the files of Emacs which are intended for use with other | 366 | /* Some of the files of Emacs which are intended for use with other |
| 367 | programs assume that if you have a config.h file, you must declare | 367 | programs assume that if you have a config.h file, you must declare |
| 368 | the type of getenv. | 368 | the type of getenv. */ |
| 369 | |||
| 370 | This declaration shouldn't appear when alloca.s or Makefile.in | ||
| 371 | includes config.h. */ | ||
| 372 | #ifndef NOT_C_CODE | ||
| 373 | extern char *getenv (); | 369 | extern char *getenv (); |
| 374 | #endif | 370 | #endif |
| 375 | #endif | ||
| 376 | 371 | ||
| 377 | #endif /* EMACS_CONFIG_H */ | 372 | #endif /* EMACS_CONFIG_H */ |
| 378 | 373 | ||
| @@ -414,8 +409,6 @@ extern char *getenv (); | |||
| 414 | #endif | 409 | #endif |
| 415 | #endif | 410 | #endif |
| 416 | 411 | ||
| 417 | /* Don't include <string.h> during configure. */ | ||
| 418 | #ifndef NOT_C_CODE | ||
| 419 | #ifdef HAVE_STRING_H | 412 | #ifdef HAVE_STRING_H |
| 420 | #include "string.h" | 413 | #include "string.h" |
| 421 | #endif | 414 | #endif |
| @@ -425,7 +418,6 @@ extern char *getenv (); | |||
| 425 | #ifdef HAVE_STDLIB_H | 418 | #ifdef HAVE_STDLIB_H |
| 426 | #include <stdlib.h> | 419 | #include <stdlib.h> |
| 427 | #endif | 420 | #endif |
| 428 | #endif | ||
| 429 | 421 | ||
| 430 | #ifndef NO_RETURN | 422 | #ifndef NO_RETURN |
| 431 | #if defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR >= 5)) | 423 | #if defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR >= 5)) |
| @@ -436,12 +428,10 @@ extern char *getenv (); | |||
| 436 | #endif | 428 | #endif |
| 437 | 429 | ||
| 438 | /* Redefine abort. */ | 430 | /* Redefine abort. */ |
| 439 | #ifndef NOT_C_CODE | ||
| 440 | #ifdef HAVE_NTGUI | 431 | #ifdef HAVE_NTGUI |
| 441 | #define abort w32_abort | 432 | #define abort w32_abort |
| 442 | void w32_abort (void) NO_RETURN; | 433 | void w32_abort (void) NO_RETURN; |
| 443 | #endif | 434 | #endif |
| 444 | #endif | ||
| 445 | 435 | ||
| 446 | /* Prevent accidental use of features unavailable in | 436 | /* Prevent accidental use of features unavailable in |
| 447 | older Windows versions we still support. */ | 437 | older Windows versions we still support. */ |