[Emacs-diffs] /srv/bzr/emacs/trunk r100508: NOT_C_CODE is always true now.

[Glenn Morris]

------------------------------------------------------------
revno: 100508
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-06-02 22:29:02 -0700
message:
  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.
modified:
  ChangeLog
  admin/CPP-DEFINES
  configure.in
  nt/ChangeLog
  nt/config.nt
  src/ChangeLog
  src/m/ia64.h
  src/s/gnu-linux.h
  src/s/gnu.h
  src/s/netbsd.h
  src/s/usg5-4.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-06-02 02:32:43 +0000
+++ b/ChangeLog 2010-06-03 05:29:02 +0000
@@ -1,3 +1,7 @@
+2010-06-03  Glenn Morris  <address@hidden>
+
+       * configure.in (AH_BOTTOM): Remove NOT_C_CODE test, it is always true.
+
 2010-06-02  Dan Nicolaescu  <address@hidden>
 
        Fix alloca definition when using gcc on non-gnu systems.

=== modified file 'admin/CPP-DEFINES'
--- a/admin/CPP-DEFINES 2010-05-15 00:54:24 +0000
+++ b/admin/CPP-DEFINES 2010-06-03 05:29:02 +0000
@@ -227,7 +227,6 @@
 MODE_LINE_BINARY_TEXT
 MUST_UNDEF__STDC__
 NLIST_STRUCT
-NOT_C_CODE
 NO_ABORT
 NO_EDITRES
 NO_MATHERR

=== modified file 'configure.in'
--- a/configure.in      2010-06-02 02:32:43 +0000
+++ b/configure.in      2010-06-03 05:29:02 +0000
@@ -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 <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 @@
 # 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.  */
 

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2010-05-13 03:18:04 +0000
+++ b/nt/ChangeLog      2010-06-03 05:29:02 +0000
@@ -1,3 +1,7 @@
+2010-06-03  Glenn Morris  <address@hidden>
+
+       * config.nt: Remove NOT_C_CODE tests, it is always true now.
+
 2010-05-13  Glenn Morris  <address@hidden>
 
        * config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs.

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2010-05-13 03:18:04 +0000
+++ b/nt/config.nt      2010-06-03 05:29:02 +0000
@@ -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 <string.h> during configure.  */
-#ifndef NOT_C_CODE
 #ifdef HAVE_STRING_H
 #include "string.h"
 #endif
@@ -425,7 +418,6 @@
 #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 @@
 #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.  */

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-06-02 04:29:53 +0000
+++ b/src/ChangeLog     2010-06-03 05:29:02 +0000
@@ -1,3 +1,8 @@
+2010-06-03  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        Fix config.h includes.

=== modified file 'src/m/ia64.h'
--- a/src/m/ia64.h      2010-05-16 05:40:10 +0000
+++ b/src/m/ia64.h      2010-06-03 05:29:02 +0000
@@ -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

=== modified file 'src/s/gnu-linux.h'
--- a/src/s/gnu-linux.h 2010-05-18 03:03:14 +0000
+++ b/src/s/gnu-linux.h 2010-06-03 05:29:02 +0000
@@ -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 <linux/version.h>
@@ -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

=== modified file 'src/s/gnu.h'
--- a/src/s/gnu.h       2010-05-19 02:42:04 +0000
+++ b/src/s/gnu.h       2010-06-03 05:29:02 +0000
@@ -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 <fcntl.h>
-#endif
 
 #ifdef emacs
 #include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */

=== modified file 'src/s/netbsd.h'
--- a/src/s/netbsd.h    2010-05-25 00:54:13 +0000
+++ b/src/s/netbsd.h    2010-06-03 05:29:02 +0000
@@ -31,9 +31,7 @@
 /* Greg A. Woods <address@hidden> 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

=== modified file 'src/s/usg5-4.h'
--- a/src/s/usg5-4.h    2010-05-19 02:42:04 +0000
+++ b/src/s/usg5-4.h    2010-06-03 05:29:02 +0000
@@ -77,9 +77,7 @@
 /* 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>