Commit 0d4bcf4d authored by Glenn Morris's avatar Glenn Morris

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.
parent dd2c3c92
2010-06-03 Glenn Morris <rgm@gnu.org>
* configure.in (AH_BOTTOM): Remove NOT_C_CODE test, it is always true.
2010-06-02 Dan Nicolaescu <dann@ics.uci.edu> 2010-06-02 Dan Nicolaescu <dann@ics.uci.edu>
Fix alloca definition when using gcc on non-gnu systems. Fix alloca definition when using gcc on non-gnu systems.
......
...@@ -227,7 +227,6 @@ MIN_PTY_KERNEL_VERSION -- only used on Mac ...@@ -227,7 +227,6 @@ MIN_PTY_KERNEL_VERSION -- only used on Mac
MODE_LINE_BINARY_TEXT MODE_LINE_BINARY_TEXT
MUST_UNDEF__STDC__ MUST_UNDEF__STDC__
NLIST_STRUCT NLIST_STRUCT
NOT_C_CODE
NO_ABORT NO_ABORT
NO_EDITRES NO_EDITRES
NO_MATHERR NO_MATHERR
......
...@@ -3546,13 +3546,8 @@ SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */ ...@@ -3546,13 +3546,8 @@ SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */
/* Some of the files of Emacs which are intended for use with other /* 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 programs assume that if you have a config.h file, you must declare
the type of getenv. the type of getenv. */
This declaration shouldn't appear when alloca.s or Makefile.in
includes config.h. */
#ifndef NOT_C_CODE
extern char *getenv (); extern char *getenv ();
#endif
/* These default definitions are good for almost all machines. /* These default definitions are good for almost all machines.
The exceptions override them in m/MACHINE.h. */ The exceptions override them in m/MACHINE.h. */
...@@ -3593,17 +3588,18 @@ extern char *getenv (); ...@@ -3593,17 +3588,18 @@ extern char *getenv ();
# endif /* GCC. */ # endif /* GCC. */
#endif /* __P */ #endif /* __P */
/* Don't include "string.h" or <stdlib.h> in non-C code. */
#ifndef NOT_C_CODE
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include "string.h" #include "string.h"
#endif #endif
#ifdef HAVE_STRINGS_H #ifdef HAVE_STRINGS_H
#include "strings.h" /* May be needed for bcopy & al. */ #include "strings.h" /* May be needed for bcopy & al. */
#endif #endif
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#ifdef HAVE_ALLOCA_H #ifdef HAVE_ALLOCA_H
# include <alloca.h> # include <alloca.h>
#elif defined __GNUC__ #elif defined __GNUC__
...@@ -3617,10 +3613,10 @@ extern "C" ...@@ -3617,10 +3613,10 @@ extern "C"
# endif # endif
void *alloca (size_t); void *alloca (size_t);
#endif #endif
#ifndef HAVE_SIZE_T #ifndef HAVE_SIZE_T
typedef unsigned size_t; typedef unsigned size_t;
#endif #endif
#endif /* NOT_C_CODE */
/* Define HAVE_X_I18N if we have usable i18n support. */ /* Define HAVE_X_I18N if we have usable i18n support. */
......
2010-06-03 Glenn Morris <rgm@gnu.org>
* config.nt: Remove NOT_C_CODE tests, it is always true now.
2010-05-13 Glenn Morris <rgm@gnu.org> 2010-05-13 Glenn Morris <rgm@gnu.org>
* config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs. * config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs.
......
...@@ -365,14 +365,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -365,14 +365,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef WINDOWSNT #ifndef WINDOWSNT
/* Some of the files of Emacs which are intended for use with other /* 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 programs assume that if you have a config.h file, you must declare
the type of getenv. the type of getenv. */
This declaration shouldn't appear when alloca.s or Makefile.in
includes config.h. */
#ifndef NOT_C_CODE
extern char *getenv (); extern char *getenv ();
#endif #endif
#endif
#endif /* EMACS_CONFIG_H */ #endif /* EMACS_CONFIG_H */
...@@ -414,8 +409,6 @@ extern char *getenv (); ...@@ -414,8 +409,6 @@ extern char *getenv ();
#endif #endif
#endif #endif
/* Don't include <string.h> during configure. */
#ifndef NOT_C_CODE
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include "string.h" #include "string.h"
#endif #endif
...@@ -425,7 +418,6 @@ extern char *getenv (); ...@@ -425,7 +418,6 @@ extern char *getenv ();
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#endif
#ifndef NO_RETURN #ifndef NO_RETURN
#if defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR >= 5)) #if defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR >= 5))
...@@ -436,12 +428,10 @@ extern char *getenv (); ...@@ -436,12 +428,10 @@ extern char *getenv ();
#endif #endif
/* Redefine abort. */ /* Redefine abort. */
#ifndef NOT_C_CODE
#ifdef HAVE_NTGUI #ifdef HAVE_NTGUI
#define abort w32_abort #define abort w32_abort
void w32_abort (void) NO_RETURN; void w32_abort (void) NO_RETURN;
#endif #endif
#endif
/* Prevent accidental use of features unavailable in /* Prevent accidental use of features unavailable in
older Windows versions we still support. */ older Windows versions we still support. */
......
2010-06-03 Glenn Morris <rgm@gnu.org>
* 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 <dann@ics.uci.edu> 2010-06-02 Dan Nicolaescu <dann@ics.uci.edu>
Fix config.h includes. Fix config.h includes.
......
...@@ -48,8 +48,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -48,8 +48,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Convert that into an integer that is 100 for a load average of 1.0 */ /* 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) #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
#ifndef NOT_C_CODE
#ifdef REL_ALLOC #ifdef REL_ALLOC
#ifndef _MALLOC_INTERNAL #ifndef _MALLOC_INTERNAL
/* "char *" because ralloc.c defines it that way. gmalloc.c thinks it /* "char *" because ralloc.c defines it that way. gmalloc.c thinks it
...@@ -60,8 +58,6 @@ extern void r_alloc_free (); ...@@ -60,8 +58,6 @@ extern void r_alloc_free ();
#endif /* not _MALLOC_INTERNAL */ #endif /* not _MALLOC_INTERNAL */
#endif /* REL_ALLOC */ #endif /* REL_ALLOC */
#endif /* not NOT_C_CODE */
#define HAVE_TEXT_START #define HAVE_TEXT_START
/* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66 /* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66
......
...@@ -29,7 +29,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -29,7 +29,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
It sets the Lisp variable system-type. */ It sets the Lisp variable system-type. */
#define SYSTEM_TYPE "gnu/linux" /* All the best software is free. */ #define SYSTEM_TYPE "gnu/linux" /* All the best software is free. */
#ifndef NOT_C_CODE
#ifdef emacs #ifdef emacs
#ifdef HAVE_LINUX_VERSION_H #ifdef HAVE_LINUX_VERSION_H
#include <linux/version.h> #include <linux/version.h>
...@@ -40,7 +39,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -40,7 +39,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif /* LINUX_VERSION_CODE >= 0x20400 */ #endif /* LINUX_VERSION_CODE >= 0x20400 */
#endif /* HAVE_LINUX_VERSION_H */ #endif /* HAVE_LINUX_VERSION_H */
#endif /* emacs */ #endif /* emacs */
#endif /* NOT_C_CODE */
#if defined HAVE_GRANTPT #if defined HAVE_GRANTPT
#define UNIX98_PTYS #define UNIX98_PTYS
......
...@@ -34,9 +34,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -34,9 +34,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Some losing code fails to include this and then assumes /* Some losing code fails to include this and then assumes
that because it is braindead that O_RDONLY==0. */ that because it is braindead that O_RDONLY==0. */
#ifndef NOT_C_CODE
#include <fcntl.h> #include <fcntl.h>
#endif
#ifdef emacs #ifdef emacs
#include <stdio.h> /* Get the definition of _IO_STDIO_H. */ #include <stdio.h> /* Get the definition of _IO_STDIO_H. */
......
...@@ -31,9 +31,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -31,9 +31,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Greg A. Woods <woods@weird.com> says we must include signal.h /* Greg A. Woods <woods@weird.com> says we must include signal.h
before syssignal.h is included, to work around interface conflicts before syssignal.h is included, to work around interface conflicts
that are handled with CPP __RENAME() macro in signal.h. */ that are handled with CPP __RENAME() macro in signal.h. */
#ifndef NOT_C_CODE
#include <signal.h> #include <signal.h>
#endif
/* Don't close pty in process.c to make it as controlling terminal. /* Don't close pty in process.c to make it as controlling terminal.
It is already a controlling terminal of subprocess, because we did It is already a controlling terminal of subprocess, because we did
......
...@@ -77,9 +77,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -77,9 +77,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars. /* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars.
But get <termio.h> first to make sure ttold.h doesn't interfere. But get <termio.h> first to make sure ttold.h doesn't interfere.
And don't try to use SIGIO yet. */ And don't try to use SIGIO yet. */
#ifndef NOT_C_CODE
#include <sys/wait.h> #include <sys/wait.h>
#endif
#ifdef emacs #ifdef emacs
#include <sys/filio.h> #include <sys/filio.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment