From: Dan Nicolaescu Date: Wed, 16 Jul 2008 07:45:52 +0000 (+0000) Subject: * sysdep.c: Remove code depending on NEED_PTEM_H, unused. Remove X-Git-Tag: emacs-pretest-23.0.90~4144 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c7607b94f52c04bcc4e1e8b00ce954c9e34c3e19;p=emacs.git * 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. * s/vms.h (BAUD_CONVERT): Remove, same as the default. Remove boilerplate comments. * s/hpux10-20.h (BAUD_CONVERT): Remove, same as the default. (HAVE_SYSVIPC): Remove, unused. (LD_SWITCH_SYSTEM_TEMACS): Simplify, hp9000s700 not supported anymore. --- diff --git a/src/ChangeLog b/src/ChangeLog index f3cb107438e..e121a7625f0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,15 @@ 2008-07-16 Dan Nicolaescu + * 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. + * s/vms.h (BAUD_CONVERT): Remove, same as the default. + Remove boilerplate comments. + * s/hpux10-20.h (BAUD_CONVERT): Remove, same as the default. + (HAVE_SYSVIPC): Remove, unused. + (LD_SWITCH_SYSTEM_TEMACS): Simplify, hp9000s700 not supported anymore. + * 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. @@ -8,11 +18,6 @@ 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/s/hpux10-20.h b/src/s/hpux10-20.h index 8411f74191b..45242c6862b 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h @@ -36,17 +36,6 @@ along with GNU Emacs. If not, see . */ #define SYSTEM_TYPE "hpux" -/* `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). - - On hpux this depends on the precise kind of machine in use, - so the m- file defines this symbol if appropriate. */ - -/* Default is to set interrupt_input to 0: don't do input buffering within Emacs */ - -/* #define INTERRUPT_INPUT */ - /* Letter to use in finding device name of first pty, if system supports pty's. 'p' means it is /dev/ptym/ptyp0 */ @@ -85,22 +74,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 - /usr/spool/mail/$USER.lock. */ - -/* #define MAIL_USE_FLOCK */ - -/* Say we have the SYSV style of interprocess communication. */ - -#define HAVE_SYSVIPC - /* 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. */ @@ -112,24 +85,6 @@ along with GNU Emacs. If not, see . */ /* Special hacks needed to make Emacs run on this system. */ -/* - * Make the sigsetmask function go away. Don't know what the - * ramifications of this are, but doesn't seem possible to - * emulate it properly anyway at this point. - */ - -/* HPUX has sigsetmask */ -/* #define sigsetmask(mask) / * Null expansion * / */ - -/* setjmp and longjmp can safely replace _setjmp and _longjmp, - but they will run slower. */ - -/* HP-UX has _setjmp and _longjmp */ -/* -#define _setjmp setjmp -#define _longjmp longjmp -*/ - /* Use the system provided termcap(3) library */ #define TERMINFO @@ -138,31 +93,10 @@ along with GNU Emacs. If not, see . */ #define BROKEN_SIGIO -/* USG systems tend to put everything declared static - into the initialized data area, which becomes pure after dumping Emacs. - Foil this. Emacs carefully avoids static vars inside functions. - http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00368.html - As of at least HPUX 11.11 (2000), it seems this workaround is no - longer needed. Try uncommenting the following if you have problems - on older versions. */ - -/* This is unnecessary in HPUX versions 10.20, 11.0, 11.11, 11.23. */ - -/* #define static */ - /* Some additional system facilities exist. */ #define HAVE_PERROR /* Delete this line for version 6. */ -/* The following maps shared exec file to demand loaded exec. - Don't do this as demand loaded exec is broken in hpux. */ - -/* Baud-rate values in tty status have nonstandard meanings. */ - -#define BAUD_CONVERT \ -{ 0, 50, 75, 110, 135, 150, 200, 300, 600, 900, 1200, \ - 1800, 2400, 3600, 4800, 7200, 9600, 19200, 38400 } - /* This is how to get the device name of the tty end of a pty. */ #define PTY_TTY_NAME_SPRINTF \ sprintf (pty_name, "/dev/pty/tty%c%x", c, i); @@ -177,21 +111,7 @@ along with GNU Emacs. If not, see . */ /* Don't use shared libraries. unexec doesn't handle them. Note GCC automatically passes -a archive to ld, and it has its own conflicting -a. */ -#ifdef __GNUC__ - -#define LD_SWITCH_SYSTEM_TEMACS - -#else /* not __GNUC__ */ -/* Note, -a only works for hpux ld, not cc. And "cc LD_SWITCH_SYSTEM" - is used in configure's $ac_link to do various autoconf checks. - Since we only need -a when unexec'ing, only pass in -a to - "ld temacs" (ghazi@caip.rutgers.edu 7/10/97). */ -#if (defined(hp9000s700) || defined(__hp9000s700)) -#define LD_SWITCH_SYSTEM_TEMACS -L/lib/pa1.1 -#else /* not (defined(hp9000s700) || defined(__hp9000s700)) */ #define LD_SWITCH_SYSTEM_TEMACS -#endif /* not (defined(hp9000s700) || defined(__hp9000s700)) */ -#endif /* not __GNUC__ */ /* Some hpux 8 machines seem to have TIOCGWINSZ, and none have sioctl.h, so might as well define this. */ diff --git a/src/s/vms.h b/src/s/vms.h index 6e269e61a0d..7c2d4ad43d1 100644 --- a/src/s/vms.h +++ b/src/s/vms.h @@ -33,32 +33,11 @@ along with GNU Emacs. If not, see . */ #define SYSTEM_TYPE "vax-vms" -/* 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 */ - -/* INTERRUPT_INPUT controls a default for Unix systems. - VMS uses a separate mechanism. */ - -/* #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 HAVE_SOCKETS if system supports 4.2-compatible sockets. */ - -/* #define HAVE_SOCKETS */ - /* * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate * The 4.2 opendir, etc., library functions. @@ -66,10 +45,6 @@ along with GNU Emacs. If not, see . */ #define NONSYSTEM_DIR_LIBRARY -/* Define this symbol if your system has the functions bcopy, etc. */ - -/* #define BSTRING */ - /* subprocesses should be defined if you want to have code for asynchronous subprocesses (as used in M-x compile and M-x shell). @@ -78,24 +53,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 - /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 */ - /* Define the maximum record length for print strings, if needed. */ #define MAX_PRINT_CHARS 300 @@ -225,12 +182,6 @@ globalref char sdata[]; #define DATA_START (((int) sdata + 511) & ~511) #define TEXT_START 512 -/* Baud-rate values from tty status are not standard. */ - -#define BAUD_CONVERT \ -{ 0, 50, 75, 110, 134, 150, 300, 600, 1200, 1800, \ - 2000, 2400, 3600, 4800, 7200, 9600, 19200 } - #define PURESIZE 330000 /* Stdio FILE type has extra indirect on VMS, so must alter this macro. */ diff --git a/src/sysdep.c b/src/sysdep.c index ef56346a313..1721172e0d6 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -31,13 +31,6 @@ along with GNU Emacs. If not, see . */ #include "lisp.h" /* Including stdlib.h isn't necessarily enough to get srandom declared, e.g. without __USE_XOPEN_EXTENDED with glibc 2. */ -#ifdef HAVE_RANDOM -#if 0 /* Don't prototype srandom; it takes an unsigned argument on - some systems, and an unsigned long on others, like FreeBSD - 4.1. */ -extern void srandom P_ ((unsigned int)); -#endif -#endif /* The w32 build defines select stuff in w32.h, which is included by sys/select.h (included below). */ @@ -138,12 +131,6 @@ extern int errno; #if defined (USG) #include #include -#if defined (TIOCGWINSZ) -#ifdef NEED_PTEM_H -#include -#include -#endif -#endif /* TIOCGWINSZ */ #endif /* USG */ extern int quit_char; @@ -199,14 +186,10 @@ struct utimbuf { #endif static int baud_convert[] = -#ifdef BAUD_CONVERT - BAUD_CONVERT; -#else { 0, 50, 75, 110, 135, 150, 200, 300, 600, 1200, 1800, 2400, 4800, 9600, 19200, 38400 }; -#endif #ifdef HAVE_SPEED_T #include @@ -593,13 +576,6 @@ child_setup_tty (out) #endif s.main.c_lflag &= ~ECHO; /* Disable echo */ s.main.c_lflag |= ISIG; /* Enable signals */ -#if 0 /* This causes bugs in (for instance) telnet to certain sites. */ - s.main.c_iflag &= ~ICRNL; /* Disable map of CR to NL on input */ -#ifdef INLCR /* Just being cautious, since I can't check how - widespread INLCR is--rms. */ - s.main.c_iflag &= ~INLCR; /* Disable map of NL to CR on input */ -#endif -#endif #ifdef IUCLC s.main.c_iflag &= ~IUCLC; /* Disable downcasing on input. */ #endif @@ -611,12 +587,6 @@ child_setup_tty (out) #endif s.main.c_oflag &= ~TAB3; /* Disable tab expansion */ s.main.c_cflag = (s.main.c_cflag & ~CSIZE) | CS8; /* Don't strip 8th bit */ -#if 0 - /* Said to be unnecessary: */ - s.main.c_cc[VMIN] = 1; /* minimum number of characters to accept */ - s.main.c_cc[VTIME] = 0; /* wait forever for at least 1 character */ -#endif - s.main.c_lflag |= ICANON; /* Enable erase/kill and eof processing */ s.main.c_cc[VEOF] = 04; /* insure that EOF is Control-D */ s.main.c_cc[VERASE] = CDISABLE; /* disable erase processing */ @@ -862,10 +832,6 @@ sys_subshell () if (epwd) putenv (old_pwd); /* restore previous value */ } -#if 0 /* This is also reported if last command executed in subshell failed, KFS */ - if (st) - report_file_error ("Can't execute subshell", Fcons (build_string (sh), Qnil)); -#endif #else /* not MSDOS */ #ifdef WINDOWSNT /* Waits for process completion */ @@ -1279,13 +1245,6 @@ init_sys_modes (tty_out) { struct emacs_tty tty; -#ifdef VMS -#if 0 - static int oob_chars[2] = {0, 1 << 7}; /* catch C-g's */ - extern int (*interrupt_signal) (); -#endif -#endif - Vtty_erase_char = Qnil; if (noninteractive) @@ -1304,21 +1263,8 @@ init_sys_modes (tty_out) timer_ef = get_timer_event_flag (); /* LIB$GET_EF (&timer_ef); */ SYS$CLREF (timer_ef); -#if 0 - if (!process_ef) - { - LIB$GET_EF (&process_ef); - SYS$CLREF (process_ef); - } - if (input_ef / 32 != process_ef / 32) - croak ("Input and process event flags in different clusters."); -#endif if (input_ef / 32 != timer_ef / 32) croak ("Input and timer event flags in different clusters."); -#if 0 - input_eflist = ((unsigned) 1 << (input_ef % 32)) | - ((unsigned) 1 << (process_ef % 32)); -#endif timer_eflist = ((unsigned) 1 << (input_ef % 32)) | ((unsigned) 1 << (timer_ef % 32)); #ifndef VMS4_4 @@ -2341,9 +2287,6 @@ init_system_name () if (hp) { char *fqdn = (char *) hp->h_name; -#if 0 - char *p; -#endif if (!index (fqdn, '.')) { @@ -2358,62 +2301,10 @@ init_system_name () fqdn = *alias; } hostname = fqdn; -#if 0 - /* Convert the host name to lower case. */ - /* Using ctype.h here would introduce a possible locale - dependence that is probably wrong for hostnames. */ - p = hostname; - while (*p) - { - if (*p >= 'A' && *p <= 'Z') - *p += 'a' - 'A'; - p++; - } -#endif } #endif /* !HAVE_GETADDRINFO */ } #endif /* HAVE_SOCKETS */ - /* We used to try using getdomainname here, - but NIIBE Yutaka says that - getdomainname gets the NIS/YP domain which often is not the same - as in Internet domain name. */ -#if 0 /* Turned off because sysinfo is not really likely to return the - correct Internet domain. */ -#if (HAVE_SYSINFO && defined (SI_SRPC_DOMAIN)) - if (! index (hostname, '.')) - { - /* The hostname is not fully qualified. Append the domain name. */ - - int hostlen = strlen (hostname); - int domain_size = 256; - - for (;;) - { - char *domain = (char *) alloca (domain_size + 1); - char *fqdn = (char *) alloca (hostlen + 1 + domain_size + 1); - int sys_domain_size = sysinfo (SI_SRPC_DOMAIN, domain, domain_size); - if (sys_domain_size <= 0) - break; - if (domain_size < sys_domain_size) - { - domain_size = sys_domain_size; - continue; - } - strcpy (fqdn, hostname); - if (domain[0] == '.') - strcpy (fqdn + hostlen, domain); - else if (domain[0] != 0) - { - fqdn[hostlen] = '.'; - strcpy (fqdn + hostlen + 1, domain); - } - hostname = fqdn; - break; - } - } -#endif /* HAVE_SYSINFO && defined (SI_SRPC_DOMAIN) */ -#endif /* 0 */ Vsystem_name = build_string (hostname); #endif /* HAVE_GETHOSTNAME */ #endif /* VMS */ @@ -4112,28 +4003,6 @@ sys_read (fildes, buf, nbyte) return read (fildes, buf, (nbyte < MAXIOSIZE ? nbyte : MAXIOSIZE)); } -#if 0 -int -sys_write (fildes, buf, nbyte) - int fildes; - char *buf; - unsigned int nbyte; -{ - register int nwrote, rtnval = 0; - - while (nbyte > MAXIOSIZE && (nwrote = write (fildes, buf, MAXIOSIZE)) > 0) { - nbyte -= nwrote; - buf += nwrote; - rtnval += nwrote; - } - if (nwrote < 0) - return rtnval ? rtnval : -1; - if ((nwrote = write (fildes, buf, nbyte)) < 0) - return rtnval ? rtnval : -1; - return (rtnval + nwrote); -} -#endif /* 0 */ - /* * VAX/VMS VAX C RTL really loses. It insists that records * end with a newline (carriage return) character, and if they