From: Dan Nicolaescu Date: Wed, 16 Jul 2008 07:26:30 +0000 (+0000) Subject: * m/ibms390.h: X-Git-Tag: emacs-pretest-23.0.90~4149 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc89925b3f81d62acf14331296e45a7a325d84ae;p=emacs.git * m/ibms390.h: * m/intel386.h: * m/m68k.h: * s/bsd-common.h: * s/cygwin.h: * s/darwin.h: * s/freebsd.h: * s/gnu.h: * s/msdos.h: Remove boilerplate comments. --- diff --git a/src/ChangeLog b/src/ChangeLog index 4d4c69f027e..2f58e35d9dd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,15 @@ 2008-07-16 Dan Nicolaescu + * m/ibms390.h: + * m/intel386.h: + * m/m68k.h: + * s/bsd-common.h: + * s/cygwin.h: + * s/darwin.h: + * s/freebsd.h: + * s/gnu.h: + * s/msdos.h: Remove boilerplate comments. + * m/iris4d.h: Remove boilerplate comments and code for systems that do not use this file. (IRIS_4D): Remove, unused. diff --git a/src/m/ibms390.h b/src/m/ibms390.h index f605ed35e7a..c45cc39f2d8 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h @@ -48,12 +48,6 @@ along with GNU Emacs. If not, see . */ #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. diff --git a/src/m/intel386.h b/src/m/intel386.h index 9353283c0b2..a9349be65ef 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h @@ -29,22 +29,9 @@ Intel 386 (-machine=intel386) isc2-2, 386-ix, and linux. 18.58 should support a wide variety of operating systems. - Use isc2-2 for Interactive 386/ix version 2.2. - Use 386ix for prior versions. Use linux for Linux. It isn't clear what to do on an SCO system. - -machine=is386 is used for an Integrated Solutions 386 machine. - It may also be correct for Microport systems. - -Cubix QBx/386 (-machine=intel386 -opsystem=usg5-3) - - Changes merged in 19.1. Systems before 2/A/0 may fail to compile etags.c - due to a compiler bug. - -Prime EXL (-machine=intel386 -opsystem=usg5-3) - - Minor changes merged in 19.1. NOTE-END */ /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word @@ -67,7 +54,6 @@ NOTE-END */ #define DOT_GLOBAL_START -#ifdef SOLARIS2 /* Data type of load average, as read out of kmem. */ #define LOAD_AVE_TYPE long @@ -75,49 +61,26 @@ NOTE-END */ /* This is totally uncalibrated. */ #define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE)) +#ifdef SOLARIS2 /* J.W.Hawtin@lut.ac.uk say Solaris 2.4 as well as Solaris 2.1 on X86 requires -lkvm as well. And handa@etl.gov.jp says that -lkvm needs -llelf, at least on 2.5. */ #define LIBS_MACHINE -lkvm -lelf - /* configure thinks solaris X86 has gethostname, but it does not work, so undefine it. */ #undef HAVE_GETHOSTNAME - #else /* not SOLARIS2 */ #ifdef USG5_4 /* Older USG systems do not support the load average. */ -/* Data type of load average, as read out of kmem. */ - -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -/* This is totally uncalibrated. */ - -#define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE)) #define FSCALE 256.0 #endif #endif /* not SOLARIS2 */ -/* 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 */ - /* this brings in alloca() if we're using cc */ #ifdef USG #ifndef LIB_STANDARD #ifdef USG5_4 #define LIB_STANDARD -lc +#define DATA_SEG_BITS 0x08000000 #else /* not USG5_4 */ #define LIB_STANDARD -lPW -lc #endif /* not USG5_4 */ @@ -127,10 +90,6 @@ NOTE-END */ #define TEXT_START 0 #endif /* USG */ -#ifdef USG5_4 -#define DATA_SEG_BITS 0x08000000 -#endif - #ifdef MSDOS #define NO_REMAP #endif diff --git a/src/m/m68k.h b/src/m/m68k.h index 50c8a8e7575..15ceb365595 100644 --- a/src/m/m68k.h +++ b/src/m/m68k.h @@ -47,12 +47,6 @@ along with GNU Emacs. If not, see . */ #define EXPLICIT_SIGN_EXTEND -/* 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. diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h index d0d374c8410..77a6329cbe6 100644 --- a/src/s/bsd-common.h +++ b/src/s/bsd-common.h @@ -38,12 +38,6 @@ along with GNU Emacs. If not, see . */ #define SYSTEM_TYPE "berkeley-unix" -/* nomultiplejobs should be defined if your system's shell - does not have "job control" (the ability to stop a program, - run some other program, then continue the first one). */ - -/* #define NOMULTIPLEJOBS */ - /* Do not use interrupt_input = 1 by default, because in 4.3 we can make noninterrupt input work properly. */ @@ -63,13 +57,6 @@ along with GNU Emacs. If not, see . */ #define HAVE_SOCKETS -/* - * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate - * The 4.2 opendir, etc., library functions. - */ - -/* #define NONSYSTEM_DIR_LIBRARY */ - /* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING @@ -82,11 +69,6 @@ along with GNU Emacs. If not, see . */ #define subprocesses -/* If your system uses COFF (Common Object File Format) then define the - preprocessor symbol "COFF". */ - -/* #define COFF */ - /* define MAIL_USE_FLOCK if the mailer uses flock to interlock access to /usr/spool/mail/$USER. The alternative is that a lock file named diff --git a/src/s/cygwin.h b/src/s/cygwin.h index 0063c77b1dc..aa696b40379 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h @@ -126,8 +126,6 @@ along with GNU Emacs. If not, see . */ #define TERMINFO #define HAVE_SOCKETS -/* C-g aborts emacs without this */ -/*#define HAVE_VFORK*/ /* Xaw3d causes problems -- might have been fixed by NARROWPROTO above, but I haven't tried it */ /*#undef HAVE_XAW3D*/ diff --git a/src/s/darwin.h b/src/s/darwin.h index a290188d337..4dbaa8ff3c6 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -25,8 +25,6 @@ along with GNU Emacs. If not, see . */ #define BSD4_2 /* BSD4_3 and BSD4_4 are already defined in sys/param.h */ -/* #define BSD4_3 */ -/* #define BSD4_4 */ #define BSD_SYSTEM /* #define VMS */ @@ -46,12 +44,6 @@ along with GNU Emacs. If not, see . */ #define SYSTEM_TYPE "darwin" -/* NOMULTIPLEJOBS should be defined if your system's shell - does not have "job control" (the ability to stop a program, - run some other program, then continue the first one). */ - -/* #define NOMULTIPLEJOBS */ - /* Emacs can read input using SIGIO and buffering characters itself, or using CBREAK mode and making C-g cause SIGINT. The choice is controlled by the variable interrupt_input. @@ -111,13 +103,6 @@ along with GNU Emacs. If not, see . */ */ #define MIN_PTY_KERNEL_VERSION '7' -/* - * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate - * The 4.2 opendir, etc., library functions. - */ - -/* #define NONSYSTEM_DIR_LIBRARY */ - /* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING @@ -130,11 +115,6 @@ along with GNU Emacs. If not, see . */ #define subprocesses -/* If your system uses COFF (Common Object File Format) then define the - preprocessor symbol "COFF". */ - -/* #define COFF */ - /* define MAIL_USE_FLOCK if the mailer uses flock to interlock access to /usr/spool/mail/$USER. The alternative is that a lock file named @@ -148,22 +128,6 @@ along with GNU Emacs. If not, see . */ #define CLASH_DETECTION -/* Define this if your operating system declares signal handlers to - have a type other than the usual. `The usual' is `void' for ANSI C - systems (i.e. when the __STDC__ macro is defined), and `int' for - pre-ANSI systems. If you're using GCC on an older system, __STDC__ - will be defined, but the system's include files will still say that - signal returns int or whatever; in situations like that, define - this to be what the system's include files want. */ -/* #define SIGTYPE int */ - -/* If the character used to separate elements of the executable path - is not ':', #define this to be the appropriate character constant. */ -/* #define SEPCHAR ':' */ - -/* Define this if the system can use mmap for buffer text allocation. */ -/* #define USE_MMAP_FOR_BUFFERS 1 */ - /* ============================================================ */ /* Here, add any special hacks needed @@ -173,21 +137,6 @@ along with GNU Emacs. If not, see . */ your system and must be used only through an encapsulation (Which you should place, by convention, in sysdep.c). */ -/* Some compilers tend to put everything declared static - into the initialized data area, which becomes pure after dumping Emacs. - On these systems, you must #define static as nothing to foil this. - Note that emacs carefully avoids static vars inside functions. */ - -/* #define static */ - -/* If the system's imake configuration file defines `NeedWidePrototypes' - as `NO', we must define NARROWPROTO manually. Such a define is - generated in the Makefile generated by `xmkmf'. If we don't - define NARROWPROTO, we will see the wrong function prototypes - for X functions taking float or double parameters. */ - -/* #define NARROWPROTO 1 */ - /* ============================================================ */ /* After adding support for a new system, modify the large case diff --git a/src/s/freebsd.h b/src/s/freebsd.h index aa7c21b59a5..79ecaeba0d3 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h @@ -134,12 +134,6 @@ along with GNU Emacs. If not, see . */ ioctl TIOCSCTTY. */ #define DONT_REOPEN_PTY -/* CLASH_DETECTION is defined in bsd-common.h. - In FreeBSD 2.1.5 (and other 2.1.x), this results useless symbolic links - remaining in /tmp or other directories with +t bit. - To avoid this problem, you could #undef it to use no file lock. */ -/* #undef CLASH_DETECTION */ - /* If the system's imake configuration file defines `NeedWidePrototypes' as `NO', we must define NARROWPROTO manually. Such a define is generated in the Makefile generated by `xmkmf'. If we don't diff --git a/src/s/gnu.h b/src/s/gnu.h index 811a682f74c..8192ea1cbf2 100644 --- a/src/s/gnu.h +++ b/src/s/gnu.h @@ -27,8 +27,6 @@ along with GNU Emacs. If not, see . */ #undef SYSTEM_TYPE #define SYSTEM_TYPE "gnu" -/* XXX should getloadavg be in libc? Should we have a libutil? -#define HAVE_GETLOADAVG */ #undef NLIST_STRUCT #undef KERNEL_FILE #undef LDAV_SYMBOL diff --git a/src/s/msdos.h b/src/s/msdos.h index 43e87bedd30..1307f03459f 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -55,44 +55,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ #define NOMULTIPLEJOBS -/* Emacs can read input using SIGIO and buffering characters itself, - or using CBREAK mode and making C-g cause SIGINT. - The choice is controlled by the variable interrupt_input. - Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO) - - SIGIO can be used only on systems that implement it (4.2 and 4.3). - CBREAK mode has two disadvantages - 1) At least in 4.2, it is impossible to handle the Meta key properly. - I hear that in system V this problem does not exist. - 2) Control-G causes output to be discarded. - I do not know whether this can be fixed in system V. - - Another method of doing input is planned but not implemented. - It would have Emacs fork off a separate process - to read the input and send it to the true Emacs process - through a pipe. -*/ - -/* #define INTERRUPT_INPUT */ - -/* Letter to use in finding device name of first pty, - if system supports pty's. 'a' means it is /dev/ptya0 */ - -/* #define FIRST_PTY_LETTER 'a' */ - -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -/* #define HAVE_PTYS */ - -/* - * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate - * The 4.2 opendir, etc., library functions. - */ - -/* #define NONSYSTEM_DIR_LIBRARY */ - #define SYSV_SYSTEM_DIR /* Define this symbol if your system has the functions bcopy, etc. */ @@ -116,19 +78,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ #define COFF -/* define MAIL_USE_FLOCK if the mailer uses flock - to interlock access to /usr/spool/mail/$USER. - The alternative is that a lock file named - /usr/spool/mail/$USER.lock. */ - -/* #define MAIL_USE_FLOCK */ - -/* Define CLASH_DETECTION if you want lock files to be written - so that Emacs can tell instantly when you try to modify - a file that someone else has modified in his Emacs. */ - -/* #define CLASH_DETECTION */ - /* Here, on a separate page, add any special hacks needed to make Emacs work on this system. For example, you might define certain system call names that don't