diff options
author | Dan Nicolaescu <[email protected]> | 2008-07-16 07:42:41 +0000 |
---|---|---|
committer | Dan Nicolaescu <[email protected]> | 2008-07-16 07:42:41 +0000 |
commit | ff841b30477121505bd4cb5428d882cf8414081f (patch) | |
tree | cb67f30db3168a54ec6899be2321509b3546e481 /src | |
parent | 0176a2592bb3a6e3c2d306ed0859c3c2c4c95762 (diff) |
* m/ia64.h (PNTR_COMPARISON_TYPE): Remove, same as the default.
Remove boilerplate comments.
* m/amdx86-64.h (PNTR_COMPARISON_TYPE): Remove, same as the default.
Remove boilerplate comments.
* m/ibms390x.h (PNTR_COMPARISON_TYPE): Remove, same as the default.
Remove boilerplate comments.
* lisp.h (PNTR_COMPARISON_TYPE): Define it unconditionally.
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 13 | ||||
-rw-r--r-- | src/lisp.h | 2 | ||||
-rw-r--r-- | src/m/amdx86-64.h | 24 | ||||
-rw-r--r-- | src/m/ia64.h | 40 | ||||
-rw-r--r-- | src/m/ibms390x.h | 8 |
5 files changed, 14 insertions, 73 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2f58e35d9d..f3cb107438 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,18 @@ 2008-07-16 Dan Nicolaescu <[email protected]> + * m/ia64.h (PNTR_COMPARISON_TYPE): Remove, same as the default. + Remove boilerplate comments. + * m/amdx86-64.h (PNTR_COMPARISON_TYPE): Remove, same as the default. + Remove boilerplate comments. + * m/ibms390x.h (PNTR_COMPARISON_TYPE): Remove, same as the default. + Remove boilerplate comments. + * lisp.h (PNTR_COMPARISON_TYPE): Define it unconditionally. + + * sysdep.c: Remove code depending on NEED_PTEM_H, unused. Remove + if 0-ed code. + (baud_convert): Don't depend on BAUD_CONVERT, all definitions the + were the same as the default. + * m/ibms390.h: * m/intel386.h: * m/m68k.h: diff --git a/src/lisp.h b/src/lisp.h index 366a0be146..bdf45262ff 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1660,9 +1660,7 @@ typedef struct { } while (0) /* Cast pointers to this type to compare them. Some machines want int. */ -#ifndef PNTR_COMPARISON_TYPE #define PNTR_COMPARISON_TYPE EMACS_UINT -#endif /* Define a built-in function for calling from Lisp. `lname' should be the name to give the function in Lisp, diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 781247fa9f..139cfd1003 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h @@ -69,30 +69,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) -/* Define CANNOT_DUMP on machines where unexec does not work. - Then the function dump-emacs will not be defined - and temacs will do (load "loadup") automatically unless told otherwise. */ - -/* #define CANNOT_DUMP */ - -/* Define VIRT_ADDR_VARIES if the virtual addresses of - pure and impure space as loaded can vary, and even their - relative order cannot be relied on. - - Otherwise Emacs assumes that text space precedes data space, - numerically. */ - -/* #define VIRT_ADDR_VARIES */ - -/* Define NO_REMAP if memory segmentation makes it not work well - to change the boundary between the text section and data section - when Emacs is dumped. If you define this, the preloaded Lisp - code will not be sharable; but that's better than failing completely. */ - -/* #define NO_REMAP */ - -#define PNTR_COMPARISON_TYPE unsigned long - /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ #undef DATA_SEG_BITS diff --git a/src/m/ia64.h b/src/m/ia64.h index 1e2d2800f9..f838528a62 100644 --- a/src/m/ia64.h +++ b/src/m/ia64.h @@ -32,9 +32,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define NO_ARG_ARRAY /* Now define a symbol for the cpu type, if your compiler - does not define it automatically: - Ones defined so far include vax, m68000, ns16000, pyramid, - orion, tahoe, APOLLO and many others */ + does not define it automatically. */ /* __ia64__ defined automatically */ @@ -59,47 +57,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) -/* Define VIRT_ADDR_VARIES if the virtual addresses of - pure and impure space as loaded can vary, and even their - relative order cannot be relied on. - - Otherwise Emacs assumes that text space precedes data space, - numerically. */ - -/* #define VIRT_ADDR_VARIES */ - -/* Define the following if GNU malloc and the relocating allocator do - not work together with X. */ - -/* #define SYSTEM_MALLOC */ - -/* Define NO_REMAP if memory segmentation makes it not work well - to change the boundary between the text section and data section - when Emacs is dumped. If you define this, the preloaded Lisp - code will not be sharable; but that's better than failing completely. */ - -/* #define NO_REMAP */ - -/* Some really obscure 4.2-based systems (like Sequent DYNIX) do not - support asynchronous I/O (using SIGIO) on sockets, even though it - works fine on tty's. If you have one of these systems, define the - following, and then use it in config.h (or elsewhere) to decide - when (not) to use SIGIO. - - You'd think this would go in an operating-system description file, - but since it only occurs on some, but not all, BSD systems, the - reasonable place to select for it is in the machine description - file. */ - -/* #define NO_SOCK_SIGIO */ - #ifdef __ELF__ #undef UNEXEC #define UNEXEC unexelf.o #endif -#define PNTR_COMPARISON_TYPE unsigned long - #ifndef NOT_C_CODE #ifdef REL_ALLOC diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h index 14f6509fdb..e7f9a98145 100644 --- a/src/m/ibms390x.h +++ b/src/m/ibms390x.h @@ -65,12 +65,6 @@ NOTE-END */ #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) -/* Define CANNOT_DUMP on machines where unexec does not work. - Then the function dump-emacs will not be defined - and temacs will do (load "loadup") automatically unless told otherwise. */ - -#undef CANNOT_DUMP - /* Define VIRT_ADDR_VARIES if the virtual addresses of pure and impure space as loaded can vary, and even their relative order cannot be relied on. @@ -117,8 +111,6 @@ NOTE-END */ you should also check `etc/MACHINES' to make sure its descriptions of known problems in that configuration should be updated. */ -#define PNTR_COMPARISON_TYPE unsigned long - /* On the 64 bit architecture, we can use 60 bits for addresses */ #define VALBITS 60 |