Mercurial > emacs
changeset 96833:c06568fd3844
* s/usg5-4.h (LIBS_SYSTEM): Remove, system for which this was
added not supported anymore.
* s/usg5-4-2.h (LIBS_SYSTEM):
* s/sol2.h (LIBS_SYSTEM): Do not undefine.
* s/netbsd.h (GETPGRP_NO_ARG, N_TRELOFF):
* s/lynxos.h (GETPGRP_NO_ARG):
* s/hpux10-20.h (NO_SIOCTL_H):
* s/gnu.h (GETPGRP_NO_ARG):
* s/gnu-linux.h (NO_SIOCTL_H):
* s/freebsd.h (GETPGRP_NO_ARG, N_TRELOFF):
* s/cygwin.h (GETPGRP_NO_ARG):
* s/irix6-5.h (LIBS_SYSTEM, GETPGRP_NO_ARG): Remove, unused.
(C_DEBUG_SWITCH): Remove duplicate definition.
* m/ibms390.h: Remove boilerplate comments.
* sysdep.c (closedir): Use SOLARIS2 instead of sun && USG5_4.
* process.c (HAVE_SERIAL): Consolidate ifdefs.
(wait_reading_process_output): Remove code for SunOS, platform not
supported anymore. Use SOLARIS2 instead of sun.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 20 Jul 2008 13:03:56 +0000 |
| parents | f6418143551e |
| children | d2e4a0ee9816 |
| files | admin/CPP-DEFINES src/ChangeLog src/m/ibms390.h src/process.c src/s/cygwin.h src/s/freebsd.h src/s/gnu-linux.h src/s/gnu.h src/s/hpux10-20.h src/s/irix6-5.h src/s/lynxos.h src/s/netbsd.h src/s/sol2.h src/s/usg5-4-2.h src/s/usg5-4.h src/sysdep.c |
| diffstat | 16 files changed, 30 insertions(+), 111 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/CPP-DEFINES Sun Jul 20 00:53:41 2008 +0000 +++ b/admin/CPP-DEFINES Sun Jul 20 13:03:56 2008 +0000 @@ -53,7 +53,6 @@ ADDR_CORRECT -ADJUST_EXEC_HEADER AIX AMPERSAND_FULL_NAME A_TEXT_OFFSET @@ -116,7 +115,6 @@ GC_MARK_SECONDARY_STACK GC_MARK_STACK GC_SETJMP_WORKS -GETPGRP_NO_ARG GMALLOC_INHIBIT_VALLOC GNU_LIBRARY_PENDING_OUTPUT_COUNT GNU_LINUX @@ -225,7 +223,6 @@ LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_SYSTEM_tmp LD_SWITCH_X_DEFAULT -LIBS_CARBON LIBS_DEBUG LIBS_IMAGE LIBS_MACHINE @@ -273,15 +270,12 @@ NO_MATHERR NO_REMAP NO_SHARED_LIBS -NO_SIOCTL_H NO_SOCK_SIGIO NO_TERMIO NSIG NSIG_MINIMUM NULL NULL_DEVICE -N_BADMAG -N_TRELOFF N_TXTOFF ORDINARY_LINK OTHER_FILES @@ -296,7 +290,6 @@ O_WRONLY PAGESIZE PENDING_OUTPUT_COUNT -PNTR_COMPARISON_TYPE POSIX POSIX_SIGNALS PREFER_VSUSP @@ -305,7 +298,6 @@ PTY_OPEN PTY_TTY_NAME_SPRINTF PURESIZE -PURE_SEG_BITS RUN_TIME_REMAP SA_RESTART SECTION_ALIGNMENT @@ -331,7 +323,6 @@ SYSTEM_PURESIZE_EXTRA SYSTEM_TYPE SYSV_SYSTEM_DIR -S_IFLNK Srandom TAB3 TABDLY
--- a/src/ChangeLog Sun Jul 20 00:53:41 2008 +0000 +++ b/src/ChangeLog Sun Jul 20 13:03:56 2008 +0000 @@ -1,3 +1,29 @@ +2008-07-20 Dan Nicolaescu <dann@ics.uci.edu> + + * s/usg5-4.h (LIBS_SYSTEM): Remove, system for which this was + added not supported anymore. + + * s/usg5-4-2.h (LIBS_SYSTEM): + * s/sol2.h (LIBS_SYSTEM): Do not undefine. + + * s/netbsd.h (GETPGRP_NO_ARG, N_TRELOFF): + * s/lynxos.h (GETPGRP_NO_ARG): + * s/hpux10-20.h (NO_SIOCTL_H): + * s/gnu.h (GETPGRP_NO_ARG): + * s/gnu-linux.h (NO_SIOCTL_H): + * s/freebsd.h (GETPGRP_NO_ARG, N_TRELOFF): + * s/cygwin.h (GETPGRP_NO_ARG): + * s/irix6-5.h (LIBS_SYSTEM, GETPGRP_NO_ARG): Remove, unused. + (C_DEBUG_SWITCH): Remove duplicate definition. + + * m/ibms390.h: Remove boilerplate comments. + + * sysdep.c (closedir): Use SOLARIS2 instead of sun && USG5_4. + + * process.c (HAVE_SERIAL): Consolidate ifdefs. + (wait_reading_process_output): Remove code for SunOS, platform not + supported anymore. Use SOLARIS2 instead of sun. + 2008-07-19 Adrian Robert <Adrian.B.Robert@gmail.com> * font.c (font_open_by_name): Under NS, default lface height to zero.
--- a/src/m/ibms390.h Sun Jul 20 00:53:41 2008 +0000 +++ b/src/m/ibms390.h Sun Jul 20 13:03:56 2008 +0000 @@ -57,36 +57,5 @@ #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 */ - -/* 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*/ - - -/* After adding support for a new system, modify the large case - statement in the `configure' script to recognize reasonable - configuration names, and add a description of the system to - `etc/MACHINES'. - - If you've just fixed a problem in an existing configuration file, - you should also check `etc/MACHINES' to make sure its descriptions - of known problems in that configuration should be updated. */ - /* arch-tag: d8a0ffa4-a8f0-4736-90d3-7fd7b21b8314 (do not change this comment) */
--- a/src/process.c Sun Jul 20 00:53:41 2008 +0000 +++ b/src/process.c Sun Jul 20 13:03:56 2008 +0000 @@ -2785,9 +2785,7 @@ UNGCPRO; return Qnil; } -#endif /* HAVE_SERIAL */ - -#ifdef HAVE_SERIAL + /* Used by make-serial-process to recover from errors. */ Lisp_Object make_serial_process_unwind (Lisp_Object proc) { @@ -2796,9 +2794,7 @@ remove_process (proc); return Qnil; } -#endif /* HAVE_SERIAL */ - -#ifdef HAVE_SERIAL + DEFUN ("make-serial-process", Fmake_serial_process, Smake_serial_process, 0, MANY, 0, doc: /* Create and return a serial port process. @@ -4912,19 +4908,6 @@ IF_NON_BLOCKING_CONNECT (check_connect = 0); } -#if defined(sun) && !defined(USG5_4) - if (nfds > 0 && keyboard_bit_set (&Available) - && interrupt_input) - /* System sometimes fails to deliver SIGIO. - - David J. Mackenzie says that Emacs doesn't compile under - Solaris if this code is enabled, thus the USG5_4 in the CPP - conditional. "I haven't noticed any ill effects so far. - If you find a Solaris expert somewhere, they might know - better." */ - kill (getpid (), SIGIO); -#endif - #if 0 /* When polling is used, interrupt_input is 0, so get_input_pending should read the input. So this should not be needed. */ @@ -7704,7 +7687,7 @@ else error ("select error: %s", emacs_strerror (xerrno)); } -#ifdef sun +#ifdef SOLARIS2 else if (nfds > 0 && (waitchannels & 1) && interrupt_input) /* System sometimes fails to deliver SIGIO. */ kill (getpid (), SIGIO);
--- a/src/s/cygwin.h Sun Jul 20 00:53:41 2008 +0000 +++ b/src/s/cygwin.h Sun Jul 20 13:03:56 2008 +0000 @@ -110,7 +110,6 @@ #define CYGWIN 1 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) -#define GETPGRP_NO_ARG 1 #define SYSV_SYSTEM_DIR 1 #define UNEXEC unexcw.o #define POSIX_SIGNALS 1
--- a/src/s/freebsd.h Sun Jul 20 00:53:41 2008 +0000 +++ b/src/s/freebsd.h Sun Jul 20 13:03:56 2008 +0000 @@ -65,7 +65,6 @@ /* freebsd has POSIX-style pgrp behavior. */ #undef BSD_PGRPS -#define GETPGRP_NO_ARG #ifdef __ELF__ @@ -90,9 +89,6 @@ #define RUN_TIME_REMAP #define LIB_GCC -lgcc -#ifndef N_TRELOFF -#define N_TRELOFF(x) N_RELOFF(x) -#endif #else /* NO_SHARED_LIBS */ #ifdef __FreeBSD__ /* shared libs are available, but the user prefers not to use them. */
--- a/src/s/gnu-linux.h Sun Jul 20 00:53:41 2008 +0000 +++ b/src/s/gnu-linux.h Sun Jul 20 13:03:56 2008 +0000 @@ -190,10 +190,6 @@ #define INTERRUPT_INPUT #endif -/* This is needed for sysdep.c */ - -#define NO_SIOCTL_H /* don't have sioctl.h */ - #define SYSV_SYSTEM_DIR /* use dirent.h */ #define POSIX /* affects getpagesize.h and systty.h */
--- a/src/s/gnu.h Sun Jul 20 00:53:41 2008 +0000 +++ b/src/s/gnu.h Sun Jul 20 13:03:56 2008 +0000 @@ -53,7 +53,6 @@ /* GNU has POSIX-style pgrp behavior. */ #undef BSD_PGRPS -#define GETPGRP_NO_ARG /* Use mmap directly for allocating larger buffers. */ #ifdef DOUG_LEA_MALLOC
--- a/src/s/hpux10-20.h Sun Jul 20 00:53:41 2008 +0000 +++ b/src/s/hpux10-20.h Sun Jul 20 13:03:56 2008 +0000 @@ -113,10 +113,6 @@ conflicting -a. */ #define LD_SWITCH_SYSTEM_TEMACS -/* Some hpux 8 machines seem to have TIOCGWINSZ, - and none have sioctl.h, so might as well define this. */ -#define NO_SIOCTL_H - #ifndef HAVE_LIBXMU /* HP-UX doesn't supply Xmu. */ #define LIBXMU
--- a/src/s/irix6-5.h Sun Jul 20 00:53:41 2008 +0000 +++ b/src/s/irix6-5.h Sun Jul 20 13:03:56 2008 +0000 @@ -28,10 +28,6 @@ #define SETPGRP_RELEASES_CTTY -#ifdef LIBS_SYSTEM -#undef LIBS_SYSTEM -#endif - #ifdef LIB_STANDARD #undef LIB_STANDARD #endif @@ -49,13 +45,6 @@ /* Make process_send_signal work by "typing" a signal character on the pty. */ #define SIGNALS_VIA_CHARACTERS -/* SGI has all the fancy wait stuff, but we can't include sys/wait.h - because it defines BIG_ENDIAN and LITTLE_ENDIAN (ugh!.) Instead - we'll just define WNOHANG right here. - (An implicit decl is good enough for wait3.) */ - -/* #define WNOHANG 0x1 */ - /* No need to use sprintf to get the tty name--we get that from _getpty. */ #ifdef PTY_TTY_NAME_SPRINTF #undef PTY_TTY_NAME_SPRINTF @@ -95,9 +84,6 @@ throughout. */ #define POSIX_SIGNALS -/* Info from simon@lia.di.epfl.ch (Simon Leinen) suggests this is needed. */ -#define GETPGRP_NO_ARG - /* Ulimit(UL_GMEMLIM) is busted... */ #define ULIMIT_BREAK_VALUE 0x14000000 @@ -111,14 +97,6 @@ #define MAIL_USE_FLOCK -/* -g used not to work on Irix unless you used gas, and since gcc - warns if you use it, turn off the warning. */ -/* -g does now work, at least on recent Irix 6 versions with gcc 2.95; - I'm not sure about Irix 5 -- fx */ -#ifdef __GNUC__ -#define C_DEBUG_SWITCH -#endif - #define NARROWPROTO 1 #define USE_MMAP_FOR_BUFFERS 1 @@ -134,7 +112,6 @@ /* The only supported 32-bit configuration of GCC under IRIX6.x produces n32 MIPS ABI binaries and also supports -g. */ #ifdef __GNUC__ -#undef C_DEBUG_SWITCH #define C_DEBUG_SWITCH -g #else /* Optimize, inaccurate debugging, increase limit on size of what's
--- a/src/s/lynxos.h Sun Jul 20 00:53:41 2008 +0000 +++ b/src/s/lynxos.h Sun Jul 20 13:03:56 2008 +0000 @@ -34,7 +34,6 @@ #define LDAV_SYMBOL "load_average" /* misc defines */ -#define GETPGRP_NO_ARG #define LNOFLSH 0 /* COFF related */
--- a/src/s/netbsd.h Sun Jul 20 00:53:41 2008 +0000 +++ b/src/s/netbsd.h Sun Jul 20 13:03:56 2008 +0000 @@ -58,8 +58,6 @@ /* Netbsd has POSIX-style pgrp behavior. */ #undef BSD_PGRPS -#define GETPGRP_NO_ARG - #if !defined (NO_SHARED_LIBS) && ! defined (__ELF__) /* These definitions should work for either dynamic or static linking, whichever is the default for `cc -nostdlib'. */ @@ -68,10 +66,6 @@ #define UNEXEC unexsunos4.o #define RUN_TIME_REMAP -/* Try to make this work for both 0.9 and >0.9. */ -#ifndef N_TRELOFF -#define N_TRELOFF(x) N_RELOFF(x) -#endif #endif /* not NO_SHARED_LIBS and not ELF */ #if !defined (NO_SHARED_LIBS) && defined (__ELF__)
--- a/src/s/sol2.h Sun Jul 20 00:53:41 2008 +0000 +++ b/src/s/sol2.h Sun Jul 20 13:03:56 2008 +0000 @@ -40,7 +40,6 @@ #define LD_SWITCH_SYSTEM `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` #endif /* GCC */ -#undef LIBS_SYSTEM #define LIBS_SYSTEM -lsocket -lnsl -lkstat /* Prefer kstat over kvm in getloadavg.c, kstat doesn't require root.
--- a/src/s/usg5-4-2.h Sun Jul 20 00:53:41 2008 +0000 +++ b/src/s/usg5-4-2.h Sun Jul 20 13:03:56 2008 +0000 @@ -34,7 +34,6 @@ #undef HAVE_SYSV_SIGPAUSE /* Motif needs -lgen. */ -#undef LIBS_SYSTEM #define LIBS_SYSTEM -lsocket -lnsl -lelf -lgen /* This is the same definition as in usg5-4.h, but with sigblock/sigunblock
--- a/src/s/usg5-4.h Sun Jul 20 00:53:41 2008 +0000 +++ b/src/s/usg5-4.h Sun Jul 20 13:03:56 2008 +0000 @@ -222,9 +222,5 @@ So give it a try. */ #define HAVE_SOCKETS -/* Markus Weiand <weiand@khof.com> says this is needed for Motif on - SINIX. */ -#define LIBS_SYSTEM -lgen - /* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6 (do not change this comment) */
--- a/src/sysdep.c Sun Jul 20 00:53:41 2008 +0000 +++ b/src/sysdep.c Sun Jul 20 13:03:56 2008 +0000 @@ -3295,7 +3295,7 @@ /* Some systems (like Solaris) allocate the buffer and the DIR all in one block. Why in the world are we freeing this ourselves anyway? */ -#if ! (defined (sun) && defined (USG5_4)) +#if ! defined (SOLARIS2) xfree ((char *) dirp->dd_buf); /* directory block defined in <dirent.h> */ #endif xfree ((char *) dirp);