From: Dan Nicolaescu Date: Sun, 20 Jul 2008 13:03:56 +0000 (+0000) Subject: * s/usg5-4.h (LIBS_SYSTEM): Remove, system for which this was X-Git-Tag: emacs-pretest-23.0.90~4053 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=89f1e540e1bbee8224fa3e5fddbc92cc44d657c1;p=emacs.git * 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. --- diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 25fbc598ddc..a76970639ce 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -53,7 +53,6 @@ SYSTEM_MALLOC Use the system library's malloc. ADDR_CORRECT -ADJUST_EXEC_HEADER AIX AMPERSAND_FULL_NAME A_TEXT_OFFSET @@ -116,7 +115,6 @@ GC_LISP_OBJECT_ALIGNMENT 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_1 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_HYPHENS_IN_FILENAMES 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_TRUNC O_WRONLY PAGESIZE PENDING_OUTPUT_COUNT -PNTR_COMPARISON_TYPE POSIX POSIX_SIGNALS PREFER_VSUSP @@ -305,7 +298,6 @@ PTY_NAME_SPRINTF PTY_OPEN PTY_TTY_NAME_SPRINTF PURESIZE -PURE_SEG_BITS RUN_TIME_REMAP SA_RESTART SECTION_ALIGNMENT @@ -331,7 +323,6 @@ SYMS_SYSTEM SYSTEM_PURESIZE_EXTRA SYSTEM_TYPE SYSV_SYSTEM_DIR -S_IFLNK Srandom TAB3 TABDLY diff --git a/src/ChangeLog b/src/ChangeLog index b1f1d027ef8..baa61d86c01 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,29 @@ +2008-07-20 Dan Nicolaescu + + * 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 * font.c (font_open_by_name): Under NS, default lface height to zero. diff --git a/src/m/ibms390.h b/src/m/ibms390.h index c45cc39f2d8..b1de5ef7f17 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h @@ -57,36 +57,5 @@ along with GNU Emacs. If not, see . */ #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) */ diff --git a/src/process.c b/src/process.c index 0878051f733..e028ab93503 100644 --- a/src/process.c +++ b/src/process.c @@ -2785,9 +2785,7 @@ usage: (serial-process-configure &rest ARGS) */) 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 @@ Lisp_Object make_serial_process_unwind (Lisp_Object proc) 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 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display, 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 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display, 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); diff --git a/src/s/cygwin.h b/src/s/cygwin.h index b1172e622b3..fd13112730c 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h @@ -110,7 +110,6 @@ along with GNU Emacs. If not, see . */ #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 diff --git a/src/s/freebsd.h b/src/s/freebsd.h index 79ecaeba0d3..ca183b57ff1 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h @@ -65,7 +65,6 @@ along with GNU Emacs. If not, see . */ /* freebsd has POSIX-style pgrp behavior. */ #undef BSD_PGRPS -#define GETPGRP_NO_ARG #ifdef __ELF__ @@ -90,9 +89,6 @@ along with GNU Emacs. If not, see . */ #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. */ diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index b21a84b5e34..7501cd602f3 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h @@ -190,10 +190,6 @@ along with GNU Emacs. If not, see . */ #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 */ diff --git a/src/s/gnu.h b/src/s/gnu.h index 8192ea1cbf2..931d7db2ffd 100644 --- a/src/s/gnu.h +++ b/src/s/gnu.h @@ -53,7 +53,6 @@ along with GNU Emacs. If not, see . */ /* GNU has POSIX-style pgrp behavior. */ #undef BSD_PGRPS -#define GETPGRP_NO_ARG /* Use mmap directly for allocating larger buffers. */ #ifdef DOUG_LEA_MALLOC diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index 45242c6862b..201f4f4ca32 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h @@ -113,10 +113,6 @@ along with GNU Emacs. If not, see . */ 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 diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h index 1ccaf432dac..0a7e2c70c6f 100644 --- a/src/s/irix6-5.h +++ b/src/s/irix6-5.h @@ -28,10 +28,6 @@ along with GNU Emacs. If not, see . */ #define SETPGRP_RELEASES_CTTY -#ifdef LIBS_SYSTEM -#undef LIBS_SYSTEM -#endif - #ifdef LIB_STANDARD #undef LIB_STANDARD #endif @@ -49,13 +45,6 @@ along with GNU Emacs. If not, see . */ /* 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 @@ char *_getpty(); 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 @@ char *_getpty(); #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 @@ char *_getpty(); /* 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 diff --git a/src/s/lynxos.h b/src/s/lynxos.h index 745c65f4ca6..d28a4ee688e 100644 --- a/src/s/lynxos.h +++ b/src/s/lynxos.h @@ -34,7 +34,6 @@ along with GNU Emacs. If not, see . */ #define LDAV_SYMBOL "load_average" /* misc defines */ -#define GETPGRP_NO_ARG #define LNOFLSH 0 /* COFF related */ diff --git a/src/s/netbsd.h b/src/s/netbsd.h index 5a667e30d2d..2e0af41a2f6 100644 --- a/src/s/netbsd.h +++ b/src/s/netbsd.h @@ -58,8 +58,6 @@ along with GNU Emacs. If not, see . */ /* 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 @@ along with GNU Emacs. If not, see . */ #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__) diff --git a/src/s/sol2.h b/src/s/sol2.h index 1938fb6d865..bd6e1c9bdba 100644 --- a/src/s/sol2.h +++ b/src/s/sol2.h @@ -40,7 +40,6 @@ along with GNU Emacs. If not, see . */ #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. diff --git a/src/s/usg5-4-2.h b/src/s/usg5-4-2.h index c6ee7ac5d32..46b350d6db9 100644 --- a/src/s/usg5-4-2.h +++ b/src/s/usg5-4-2.h @@ -34,7 +34,6 @@ along with GNU Emacs. If not, see . */ #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 diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h index 4c2a59cc27d..9639d3be24c 100644 --- a/src/s/usg5-4.h +++ b/src/s/usg5-4.h @@ -222,9 +222,5 @@ along with GNU Emacs. If not, see . */ So give it a try. */ #define HAVE_SOCKETS -/* Markus Weiand says this is needed for Motif on - SINIX. */ -#define LIBS_SYSTEM -lgen - /* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6 (do not change this comment) */ diff --git a/src/sysdep.c b/src/sysdep.c index 1721172e0d6..b19ed384754 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -3295,7 +3295,7 @@ closedir (dirp) /* 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 */ #endif xfree ((char *) dirp);