summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--admin/CPP-DEFINES1
-rw-r--r--configure.in14
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/config.nt12
-rw-r--r--src/ChangeLog5
-rw-r--r--src/m/ia64.h4
-rw-r--r--src/s/gnu-linux.h2
-rw-r--r--src/s/gnu.h2
-rw-r--r--src/s/netbsd.h2
-rw-r--r--src/s/usg5-4.h2
11 files changed, 19 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d2fe0b233c..9e9108e6dfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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>
Fix alloca definition when using gcc on non-gnu systems.
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index cffbcf95e80..d3fddbc4526 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -227,7 +227,6 @@ MIN_PTY_KERNEL_VERSION -- only used on Mac
MODE_LINE_BINARY_TEXT
MUST_UNDEF__STDC__
NLIST_STRUCT
-NOT_C_CODE
NO_ABORT
NO_EDITRES
NO_MATHERR
diff --git a/configure.in b/configure.in
index 2e31641f25f..9c006f56a21 100644
--- a/configure.in
+++ b/configure.in
@@ -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
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 @@ extern char *getenv ();
# endif /* GCC. */
#endif /* __P */
-/* Don't include "string.h" or <stdlib.h> 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 <stdlib.h>
#endif
+
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
@@ -3617,10 +3613,10 @@ extern "C"
# 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 --git a/nt/ChangeLog b/nt/ChangeLog
index 6db0eb744c9..1f13c17cfb6 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+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>
* 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/>. */
#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 @@ extern char *getenv ();
#endif
#endif
-/* Don't include <string.h> during configure. */
-#ifndef NOT_C_CODE
#ifdef HAVE_STRING_H
#include "string.h"
#endif
@@ -425,7 +418,6 @@ extern char *getenv ();
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#endif
#ifndef NO_RETURN
#if defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR >= 5))
@@ -436,12 +428,10 @@ extern char *getenv ();
#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 --git a/src/ChangeLog b/src/ChangeLog
index 44807660415..24a7dc7de0b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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>
Fix config.h includes.
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 03ec37b4269..76e2bb87d80 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -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 */
#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 @@ extern void r_alloc_free ();
#endif /* not _MALLOC_INTERNAL */
#endif /* REL_ALLOC */
-#endif /* not NOT_C_CODE */
-
#define HAVE_TEXT_START
/* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 674f00f1d09..f1ec7d99a4b 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -29,7 +29,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
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 <linux/version.h>
@@ -40,7 +39,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif /* LINUX_VERSION_CODE >= 0x20400 */
#endif /* HAVE_LINUX_VERSION_H */
#endif /* emacs */
-#endif /* NOT_C_CODE */
#if defined HAVE_GRANTPT
#define UNIX98_PTYS
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 4567f4e9f4f..95b8017ddc1 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -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
that because it is braindead that O_RDONLY==0. */
-#ifndef NOT_C_CODE
#include <fcntl.h>
-#endif
#ifdef emacs
#include <stdio.h> /* Get the definition of _IO_STDIO_H. */
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index af8fd00a6bd..6f5b24bcfa6 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -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
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 <signal.h>
-#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 --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 85499fb1124..864ace33d50 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -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.
But get <termio.h> first to make sure ttold.h doesn't interfere.
And don't try to use SIGIO yet. */
-#ifndef NOT_C_CODE
#include <sys/wait.h>
-#endif
#ifdef emacs
#include <sys/filio.h>
View Lorry Controller Status