# HG changeset patch # User Glenn Morris # Date 1275542942 25200 # Node ID 4e8dcb0d6fe0fd6c90472813adce512d2f7675a4 # Parent 9d8fb76d6857c5327353bd7fdd3b3fcac7e6d65a 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. diff -r 9d8fb76d6857 -r 4e8dcb0d6fe0 ChangeLog --- a/ChangeLog Wed Jun 02 21:48:10 2010 -0400 +++ b/ChangeLog Wed Jun 02 22:29:02 2010 -0700 @@ -1,3 +1,7 @@ +2010-06-03 Glenn Morris + + * configure.in (AH_BOTTOM): Remove NOT_C_CODE test, it is always true. + 2010-06-02 Dan Nicolaescu Fix alloca definition when using gcc on non-gnu systems. diff -r 9d8fb76d6857 -r 4e8dcb0d6fe0 admin/CPP-DEFINES --- a/admin/CPP-DEFINES Wed Jun 02 21:48:10 2010 -0400 +++ b/admin/CPP-DEFINES Wed Jun 02 22:29:02 2010 -0700 @@ -227,7 +227,6 @@ MODE_LINE_BINARY_TEXT MUST_UNDEF__STDC__ NLIST_STRUCT -NOT_C_CODE NO_ABORT NO_EDITRES NO_MATHERR diff -r 9d8fb76d6857 -r 4e8dcb0d6fe0 configure.in --- a/configure.in Wed Jun 02 21:48:10 2010 -0400 +++ b/configure.in Wed Jun 02 22:29:02 2010 -0700 @@ -3546,13 +3546,8 @@ /* Some of the files of Emacs which are intended for use with other programs assume that if you have a config.h file, you must declare - the type of getenv. - - This declaration shouldn't appear when alloca.s or Makefile.in - includes config.h. */ -#ifndef NOT_C_CODE + the type of getenv. */ extern char *getenv (); -#endif /* These default definitions are good for almost all machines. The exceptions override them in m/MACHINE.h. */ @@ -3593,17 +3588,18 @@ # endif /* GCC. */ #endif /* __P */ -/* Don't include "string.h" or in non-C code. */ -#ifndef NOT_C_CODE #ifdef HAVE_STRING_H #include "string.h" #endif + #ifdef HAVE_STRINGS_H #include "strings.h" /* May be needed for bcopy & al. */ #endif + #ifdef HAVE_STDLIB_H #include #endif + #ifdef HAVE_ALLOCA_H # include #elif defined __GNUC__ @@ -3617,10 +3613,10 @@ # endif void *alloca (size_t); #endif + #ifndef HAVE_SIZE_T typedef unsigned size_t; #endif -#endif /* NOT_C_CODE */ /* Define HAVE_X_I18N if we have usable i18n support. */ diff -r 9d8fb76d6857 -r 4e8dcb0d6fe0 nt/ChangeLog --- a/nt/ChangeLog Wed Jun 02 21:48:10 2010 -0400 +++ b/nt/ChangeLog Wed Jun 02 22:29:02 2010 -0700 @@ -1,3 +1,7 @@ +2010-06-03 Glenn Morris + + * config.nt: Remove NOT_C_CODE tests, it is always true now. + 2010-05-13 Glenn Morris * config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs. diff -r 9d8fb76d6857 -r 4e8dcb0d6fe0 nt/config.nt --- a/nt/config.nt Wed Jun 02 21:48:10 2010 -0400 +++ b/nt/config.nt Wed Jun 02 22:29:02 2010 -0700 @@ -365,14 +365,9 @@ #ifndef WINDOWSNT /* Some of the files of Emacs which are intended for use with other programs assume that if you have a config.h file, you must declare - the type of getenv. - - This declaration shouldn't appear when alloca.s or Makefile.in - includes config.h. */ -#ifndef NOT_C_CODE + the type of getenv. */ extern char *getenv (); #endif -#endif #endif /* EMACS_CONFIG_H */ @@ -414,8 +409,6 @@ #endif #endif -/* Don't include during configure. */ -#ifndef NOT_C_CODE #ifdef HAVE_STRING_H #include "string.h" #endif @@ -425,7 +418,6 @@ #ifdef HAVE_STDLIB_H #include #endif -#endif #ifndef NO_RETURN #if defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR >= 5)) @@ -436,12 +428,10 @@ #endif /* Redefine abort. */ -#ifndef NOT_C_CODE #ifdef HAVE_NTGUI #define abort w32_abort void w32_abort (void) NO_RETURN; #endif -#endif /* Prevent accidental use of features unavailable in older Windows versions we still support. */ diff -r 9d8fb76d6857 -r 4e8dcb0d6fe0 src/ChangeLog --- a/src/ChangeLog Wed Jun 02 21:48:10 2010 -0400 +++ b/src/ChangeLog Wed Jun 02 22:29:02 2010 -0700 @@ -1,3 +1,8 @@ +2010-06-03 Glenn Morris + + * 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. + 2010-06-02 Dan Nicolaescu Fix config.h includes. diff -r 9d8fb76d6857 -r 4e8dcb0d6fe0 src/m/ia64.h --- a/src/m/ia64.h Wed Jun 02 21:48:10 2010 -0400 +++ b/src/m/ia64.h Wed Jun 02 22:29:02 2010 -0700 @@ -48,8 +48,6 @@ /* Convert that into an integer that is 100 for a load average of 1.0 */ #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) -#ifndef NOT_C_CODE - #ifdef REL_ALLOC #ifndef _MALLOC_INTERNAL /* "char *" because ralloc.c defines it that way. gmalloc.c thinks it @@ -60,8 +58,6 @@ #endif /* not _MALLOC_INTERNAL */ #endif /* REL_ALLOC */ -#endif /* not NOT_C_CODE */ - #define HAVE_TEXT_START /* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66 diff -r 9d8fb76d6857 -r 4e8dcb0d6fe0 src/s/gnu-linux.h --- a/src/s/gnu-linux.h Wed Jun 02 21:48:10 2010 -0400 +++ b/src/s/gnu-linux.h Wed Jun 02 22:29:02 2010 -0700 @@ -29,7 +29,6 @@ It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "gnu/linux" /* All the best software is free. */ -#ifndef NOT_C_CODE #ifdef emacs #ifdef HAVE_LINUX_VERSION_H #include @@ -40,7 +39,6 @@ #endif /* LINUX_VERSION_CODE >= 0x20400 */ #endif /* HAVE_LINUX_VERSION_H */ #endif /* emacs */ -#endif /* NOT_C_CODE */ #if defined HAVE_GRANTPT #define UNIX98_PTYS diff -r 9d8fb76d6857 -r 4e8dcb0d6fe0 src/s/gnu.h --- a/src/s/gnu.h Wed Jun 02 21:48:10 2010 -0400 +++ b/src/s/gnu.h Wed Jun 02 22:29:02 2010 -0700 @@ -34,9 +34,7 @@ /* Some losing code fails to include this and then assumes that because it is braindead that O_RDONLY==0. */ -#ifndef NOT_C_CODE #include -#endif #ifdef emacs #include /* Get the definition of _IO_STDIO_H. */ diff -r 9d8fb76d6857 -r 4e8dcb0d6fe0 src/s/netbsd.h --- a/src/s/netbsd.h Wed Jun 02 21:48:10 2010 -0400 +++ b/src/s/netbsd.h Wed Jun 02 22:29:02 2010 -0700 @@ -31,9 +31,7 @@ /* Greg A. Woods says we must include signal.h before syssignal.h is included, to work around interface conflicts that are handled with CPP __RENAME() macro in signal.h. */ -#ifndef NOT_C_CODE #include -#endif /* Don't close pty in process.c to make it as controlling terminal. It is already a controlling terminal of subprocess, because we did diff -r 9d8fb76d6857 -r 4e8dcb0d6fe0 src/s/usg5-4.h --- a/src/s/usg5-4.h Wed Jun 02 21:48:10 2010 -0400 +++ b/src/s/usg5-4.h Wed Jun 02 22:29:02 2010 -0700 @@ -77,9 +77,7 @@ /* Get FIONREAD from . Get to get struct tchars. But get first to make sure ttold.h doesn't interfere. And don't try to use SIGIO yet. */ -#ifndef NOT_C_CODE #include -#endif #ifdef emacs #include