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 /src | |
| 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 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/m/ia64.h | 4 | ||||
| -rw-r--r-- | src/s/gnu-linux.h | 2 | ||||
| -rw-r--r-- | src/s/gnu.h | 2 | ||||
| -rw-r--r-- | src/s/netbsd.h | 2 | ||||
| -rw-r--r-- | src/s/usg5-4.h | 2 |
6 files changed, 5 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 44807660415..24a7dc7de0b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-06-03 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * m/ia64.h, s/gnu-linux.h, s/gnu.h, s/netbsd.h, s/usg5-4.h: | ||
| 4 | Remove NOT_C_CODE tests, it is always true now. | ||
| 5 | |||
| 1 | 2010-06-02 Dan Nicolaescu <dann@ics.uci.edu> | 6 | 2010-06-02 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 7 | ||
| 3 | Fix config.h includes. | 8 | 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/>. */ | |||
| 48 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 48 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 49 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | 49 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) |
| 50 | 50 | ||
| 51 | #ifndef NOT_C_CODE | ||
| 52 | |||
| 53 | #ifdef REL_ALLOC | 51 | #ifdef REL_ALLOC |
| 54 | #ifndef _MALLOC_INTERNAL | 52 | #ifndef _MALLOC_INTERNAL |
| 55 | /* "char *" because ralloc.c defines it that way. gmalloc.c thinks it | 53 | /* "char *" because ralloc.c defines it that way. gmalloc.c thinks it |
| @@ -60,8 +58,6 @@ extern void r_alloc_free (); | |||
| 60 | #endif /* not _MALLOC_INTERNAL */ | 58 | #endif /* not _MALLOC_INTERNAL */ |
| 61 | #endif /* REL_ALLOC */ | 59 | #endif /* REL_ALLOC */ |
| 62 | 60 | ||
| 63 | #endif /* not NOT_C_CODE */ | ||
| 64 | |||
| 65 | #define HAVE_TEXT_START | 61 | #define HAVE_TEXT_START |
| 66 | 62 | ||
| 67 | /* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66 | 63 | /* 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/>. */ | |||
| 29 | It sets the Lisp variable system-type. */ | 29 | It sets the Lisp variable system-type. */ |
| 30 | #define SYSTEM_TYPE "gnu/linux" /* All the best software is free. */ | 30 | #define SYSTEM_TYPE "gnu/linux" /* All the best software is free. */ |
| 31 | 31 | ||
| 32 | #ifndef NOT_C_CODE | ||
| 33 | #ifdef emacs | 32 | #ifdef emacs |
| 34 | #ifdef HAVE_LINUX_VERSION_H | 33 | #ifdef HAVE_LINUX_VERSION_H |
| 35 | #include <linux/version.h> | 34 | #include <linux/version.h> |
| @@ -40,7 +39,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 40 | #endif /* LINUX_VERSION_CODE >= 0x20400 */ | 39 | #endif /* LINUX_VERSION_CODE >= 0x20400 */ |
| 41 | #endif /* HAVE_LINUX_VERSION_H */ | 40 | #endif /* HAVE_LINUX_VERSION_H */ |
| 42 | #endif /* emacs */ | 41 | #endif /* emacs */ |
| 43 | #endif /* NOT_C_CODE */ | ||
| 44 | 42 | ||
| 45 | #if defined HAVE_GRANTPT | 43 | #if defined HAVE_GRANTPT |
| 46 | #define UNIX98_PTYS | 44 | #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/>. */ | |||
| 34 | 34 | ||
| 35 | /* Some losing code fails to include this and then assumes | 35 | /* Some losing code fails to include this and then assumes |
| 36 | that because it is braindead that O_RDONLY==0. */ | 36 | that because it is braindead that O_RDONLY==0. */ |
| 37 | #ifndef NOT_C_CODE | ||
| 38 | #include <fcntl.h> | 37 | #include <fcntl.h> |
| 39 | #endif | ||
| 40 | 38 | ||
| 41 | #ifdef emacs | 39 | #ifdef emacs |
| 42 | #include <stdio.h> /* Get the definition of _IO_STDIO_H. */ | 40 | #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/>. */ | |||
| 31 | /* Greg A. Woods <woods@weird.com> says we must include signal.h | 31 | /* Greg A. Woods <woods@weird.com> says we must include signal.h |
| 32 | before syssignal.h is included, to work around interface conflicts | 32 | before syssignal.h is included, to work around interface conflicts |
| 33 | that are handled with CPP __RENAME() macro in signal.h. */ | 33 | that are handled with CPP __RENAME() macro in signal.h. */ |
| 34 | #ifndef NOT_C_CODE | ||
| 35 | #include <signal.h> | 34 | #include <signal.h> |
| 36 | #endif | ||
| 37 | 35 | ||
| 38 | /* Don't close pty in process.c to make it as controlling terminal. | 36 | /* Don't close pty in process.c to make it as controlling terminal. |
| 39 | It is already a controlling terminal of subprocess, because we did | 37 | 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/>. */ | |||
| 77 | /* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars. | 77 | /* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars. |
| 78 | But get <termio.h> first to make sure ttold.h doesn't interfere. | 78 | But get <termio.h> first to make sure ttold.h doesn't interfere. |
| 79 | And don't try to use SIGIO yet. */ | 79 | And don't try to use SIGIO yet. */ |
| 80 | #ifndef NOT_C_CODE | ||
| 81 | #include <sys/wait.h> | 80 | #include <sys/wait.h> |
| 82 | #endif | ||
| 83 | 81 | ||
| 84 | #ifdef emacs | 82 | #ifdef emacs |
| 85 | #include <sys/filio.h> | 83 | #include <sys/filio.h> |