Mercurial > emacs
changeset 96595:cb1bfa1dca4f
* src/fileio.c:
* src/sysdep.c
* src/systty.h:
* src/m/ibmrs6000.h:
* src/m/iris4d.h:
* src/s/aix4-2.h:
* src/s/freebsd.h:
* src/s/gnu-linux.h:
* src/s/hpux10-20.h:
* src/s/hpux11.h:
* src/s/netbsd.h:
* src/s/sol2-3.h:
* src/s/sol2-4.h:
* src/s/sol2.h:
* src/s/usg5-4.h:
* src/s/vms.h: Remove references to unused variables.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Thu, 10 Jul 2008 15:26:15 +0000 |
parents | 5f13e5189ff8 |
children | fe7840feb64b |
files | admin/CPP-DEFINES src/ChangeLog src/fileio.c src/m/ibmrs6000.h src/m/iris4d.h src/s/aix4-2.h src/s/freebsd.h src/s/gnu-linux.h src/s/hpux10-20.h src/s/hpux11.h src/s/netbsd.h src/s/sol2-3.h src/s/sol2-4.h src/s/sol2.h src/s/usg5-4.h src/s/vms.h src/sysdep.c src/systty.h |
diffstat | 18 files changed, 23 insertions(+), 116 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/CPP-DEFINES Thu Jul 10 15:25:35 2008 +0000 +++ b/admin/CPP-DEFINES Thu Jul 10 15:26:15 2008 +0000 @@ -69,9 +69,6 @@ BROKEN_SIGIO BROKEN_SIGPOLL BROKEN_SIGPTY -BROKEN_TIOCGETC -BROKEN_TIOCGWINSZ -BROKEN_XLISTFONTSWITHINFO BSD4_2 BSD4_3 BSD_PGRPS @@ -106,12 +103,10 @@ EMACS_INT EMACS_UINT END_FILES_1 -EXEC_SUFFIXES EXPLICIT_SIGN_EXTEND FILE_SYSTEM_CASE FIRST_PTY_LETTER FLOAT_CHECK_DOMAIN -FORCE_ALLOCA_H FSCALE Fread GAP_USE_BCOPY @@ -132,7 +127,6 @@ HAVE_CBRT HAVE_CLOSEDIR HAVE_CRTIN -HAVE_CRTN HAVE_DUP2 HAVE_EUIDACCESS HAVE_FACES @@ -215,8 +209,6 @@ HAVE_WORKING_VFORK HAVE_XRMSETDATABASE HPUX -HPUX11 -HPUX_NET IBMR2AIX INHIBIT_X11R6_XIM INTERNAL_TERMINAL @@ -252,7 +244,6 @@ LINK_CRTL_SHARE LINUX LINUX_SBRK_BUG -LINUX_SIGNALS_VIA_CHARACTERS_DOES_WORK LISP_FLOAT_TYPE LNOFLSH LOAD_AVE_CVT @@ -264,7 +255,7 @@ MAIL_USE_SYSTEM_LOCK MAXPATHLEN MAX_PRINT_CHARS -MIN_PTY_KERNEL_VERSION +MIN_PTY_KERNEL_VERSION -- only used on Mac MODE_LINE_BINARY_TEXT MULTI_KBOARD MUST_UNDEF__STDC__ @@ -283,7 +274,6 @@ NO_ABORT NO_ARG_ARRAY NO_EDITRES -NO_FILIO_H NO_HYPHENS_IN_FILENAMES NO_MATHERR NO_REMAP @@ -297,7 +287,6 @@ NULL NULL_DEVICE N_BADMAG -N_BSSADDR N_PAGSIZ N_SYMOFF N_TRELOFF @@ -333,7 +322,6 @@ SETPGRP_RELEASES_CTTY SETUP_SLAVE_PTY SHARABLE_LIB_BUG -SHMKEY SIGALRM SIGCHLD SIGHUP @@ -344,9 +332,7 @@ SIGQUIT SIGTRAP SIGTYPE -SOCKLEN_TYPE SOLARIS2 -SOLARIS2_4 SPECIAL_EMACS_INT START_FILES START_FILES_1 @@ -354,14 +340,12 @@ SYMS_SYSTEM SYSTEM_PURESIZE_EXTRA SYSTEM_TYPE -SYSV_STREAMS SYSV_SYSTEM_DIR S_IFLNK Srandom TAB3 TABDLY TERM -TERMCAP_NAME TERMINFO TEXT_END TEXT_START @@ -395,7 +379,6 @@ XPNTR XSET XUINT -X_DEFAULT_FONT _AIX _ARCH_PPC64 _CALLBACK_ @@ -411,7 +394,6 @@ __FreeBSD__ __FreeBSD_version __GNUC__ -__LITTLE_ENDIAN __NetBSD__ __OpenBSD__ __STDC__ @@ -440,7 +422,6 @@ const creat ctime -drem dup dup2 edata
--- a/src/ChangeLog Thu Jul 10 15:25:35 2008 +0000 +++ b/src/ChangeLog Thu Jul 10 15:26:15 2008 +0000 @@ -1,3 +1,22 @@ +2008-07-10 Dan Nicolaescu <dann@ics.uci.edu> + + * src/fileio.c: + * src/sysdep.c + * src/systty.h: + * src/m/ibmrs6000.h: + * src/m/iris4d.h: + * src/s/aix4-2.h: + * src/s/freebsd.h: + * src/s/gnu-linux.h: + * src/s/hpux10-20.h: + * src/s/hpux11.h: + * src/s/netbsd.h: + * src/s/sol2-3.h: + * src/s/sol2-4.h: + * src/s/sol2.h: + * src/s/usg5-4.h: + * src/s/vms.h: Remove references to unused variables. + 2008-07-10 Andreas Schwab <schwab@suse.de> * ftfont.c (ftfont_resolve_generic_family): Remove foundry from
--- a/src/fileio.c Thu Jul 10 15:25:35 2008 +0000 +++ b/src/fileio.c Thu Jul 10 15:26:15 2008 +0000 @@ -2987,26 +2987,6 @@ } #endif /* VMS */ -#ifdef HPUX_NET - -DEFUN ("sysnetunam", Fsysnetunam, Ssysnetunam, 2, 2, 0, - doc: /* Open a network connection to PATH using LOGIN as the login string. */) - (path, login) - Lisp_Object path, login; -{ - int netresult; - - CHECK_STRING (path); - CHECK_STRING (login); - - netresult = netunam (SDATA (path), SDATA (login)); - - if (netresult == -1) - return Qnil; - else - return Qt; -} -#endif /* HPUX_NET */ DEFUN ("file-name-absolute-p", Ffile_name_absolute_p, Sfile_name_absolute_p, 1, 1, 0, @@ -6398,9 +6378,6 @@ #ifdef VMS defsubr (&Sdefine_logical_name); #endif /* VMS */ -#ifdef HPUX_NET - defsubr (&Ssysnetunam); -#endif /* HPUX_NET */ defsubr (&Sfile_name_absolute_p); defsubr (&Sfile_exists_p); defsubr (&Sfile_executable_p);
--- a/src/m/ibmrs6000.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/m/ibmrs6000.h Thu Jul 10 15:26:15 2008 +0000 @@ -86,7 +86,6 @@ /* Use shared memory. */ /* This is turned off because it does not always work. See etc/AIX.DUMP. */ /* #define HAVE_SHM */ -#define SHMKEY 5305035 /* used for shared memory code segments */ #endif /* CANNOT_DUMP */ #define N_BADMAG(x) BADMAG(x) @@ -100,11 +99,6 @@ #undef ADDR_CORRECT #define ADDR_CORRECT(x) ((int)(x)) -/* Specify the font for X to use. - This used to be Rom14.500; that's nice on the X server shipped with - the RS/6000, but it's not available on other servers. */ -#define X_DEFAULT_FONT "fixed" - /* Here override various assumptions in ymakefile */ #ifndef USG5 @@ -141,8 +135,7 @@ #define BROKEN_SIGPTY #define BROKEN_SIGPOLL -/* Don't try to include sioctl.h or ptem.h. */ -#undef NEED_SIOCTL +/* Don't try to include ptem.h. */ #undef NEED_PTEM_H #define ORDINARY_LINK
--- a/src/m/iris4d.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/m/iris4d.h Thu Jul 10 15:26:15 2008 +0000 @@ -101,21 +101,10 @@ #define LIBS_MACHINE #define LIBS_DEBUG -/* Define this if you have a fairly recent system, - in which crt1.o and crt1.n should be used. */ -#define HAVE_CRTN - #ifndef USG5_4 -#ifdef HAVE_CRTN /* Must define START-FILES so that the linker can find /usr/lib/crt0.o. */ #define START_FILES pre-crt0.o /usr/lib/crt1.o #define LIB_STANDARD -lc /usr/lib/crtn.o -#else -#define START_FILES pre-crt0.o /usr/lib/crt0.o -/* The entry-point label (start of text segment) is `start', not `__start'. */ -#define DEFAULT_ENTRY_ADDRESS start -#define LIB_STANDARD -lc -#endif #endif /* Use terminfo instead of termcap. */
--- a/src/s/aix4-2.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/s/aix4-2.h Thu Jul 10 15:26:15 2008 +0000 @@ -176,10 +176,6 @@ It is just a guess which versions of AIX need this definition. */ #define HAVE_WAIT_HEADER -/* Specify the type that the 3rd arg of `accept' points to. - It is just a guess which versions of AIX need this definition. */ -#define SOCKLEN_TYPE int - /* olson@mcs.anl.gov says -li18n is needed by -lXm. */ #define LIB_MOTIF -lXm -li18n
--- a/src/s/freebsd.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/s/freebsd.h Thu Jul 10 15:26:15 2008 +0000 @@ -91,8 +91,6 @@ #define LIB_GCC -lgcc #ifndef N_TRELOFF -#define N_PAGSIZ(x) __LDPGSZ -#define N_BSSADDR(x) (N_ALIGN(x, N_DATADDR(x)+x.a_data)) #define N_TRELOFF(x) N_RELOFF(x) #endif #else /* NO_SHARED_LIBS */
--- a/src/s/gnu-linux.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/s/gnu-linux.h Thu Jul 10 15:26:15 2008 +0000 @@ -43,7 +43,8 @@ #include <linux/version.h> #if LINUX_VERSION_CODE >= 0x20400 -#define LINUX_SIGNALS_VIA_CHARACTERS_DOES_WORK +/* 21 Jun 06: Eric Hanchrow <offby1@blarg.net> says this works. */ +#define SIGNALS_VIA_CHARACTERS #endif /* LINUX_VERSION_CODE >= 0x20400 */ #endif /* HAVE_LINUX_VERSION_H */ #endif /* emacs */ @@ -223,11 +224,6 @@ #define C_DEBUG_SWITCH #endif -/* 21 Jun 06: Eric Hanchrow <offby1@blarg.net> says this works. */ -#ifdef LINUX_SIGNALS_VIA_CHARACTERS_DOES_WORK -#define SIGNALS_VIA_CHARACTERS -#endif - /* Rob Malouf <malouf@csli.stanford.edu> says: SYSV IPC is standard a standard part of Linux since version 0.99pl10, and is a very common addition to previous versions. */
--- a/src/s/hpux10-20.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/s/hpux10-20.h Thu Jul 10 15:26:15 2008 +0000 @@ -227,16 +227,10 @@ #undef random #undef HAVE_RANDOM -#define FORCE_ALLOCA_H - /* AlainF 20-Jul-1996 says this is right. */ #define KERNEL_FILE "/stand/vmunix" -#ifdef HPUX_NET -#define LIBS_SYSTEM -ln -l:libdld.sl -#else #define LIBS_SYSTEM -l:libdld.sl -#endif /* Rainer Malzbender <rainer@displaytech.com> says definining HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20
--- a/src/s/hpux11.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/s/hpux11.h Thu Jul 10 15:26:15 2008 +0000 @@ -1,7 +1,5 @@ #include "hpux10-20.h" -#define HPUX11 - #ifdef POSIX_SIGNALS #undef POSIX_SIGNALS #endif
--- a/src/s/netbsd.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/s/netbsd.h Thu Jul 10 15:26:15 2008 +0000 @@ -72,8 +72,6 @@ /* Try to make this work for both 0.9 and >0.9. */ #ifndef N_TRELOFF -#define N_PAGSIZ(x) __LDPGSZ -#define N_BSSADDR(x) (N_ALIGN(x, N_DATADDR(x)+x.a_data)) #define N_TRELOFF(x) N_RELOFF(x) #endif #endif /* not NO_SHARED_LIBS and not ELF */
--- a/src/s/sol2-3.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/s/sol2-3.h Thu Jul 10 15:26:15 2008 +0000 @@ -21,9 +21,6 @@ #include "sol2.h" -/* Solaris 2.3 has a bug in XListFontsWithInfo. */ -#define BROKEN_XLISTFONTSWITHINFO - /* Override LD_SWITCH_SYSTEM: add -L /usr/ccs/lib to the sol2.h value. */ #undef LD_SWITCH_SYSTEM
--- a/src/s/sol2-4.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/s/sol2-4.h Thu Jul 10 15:26:15 2008 +0000 @@ -2,8 +2,6 @@ #include "sol2-3.h" -#define SOLARIS2_4 - /* Get rid of -traditional and let const really do its thing. */ #ifdef __GNUC__
--- a/src/s/sol2.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/s/sol2.h Thu Jul 10 15:26:15 2008 +0000 @@ -22,11 +22,6 @@ #define SOLARIS2 -/* eggert@twinsun.com said these work in Solaris. - Perhaps they work in all kinds of SVR4, but this is more conservative. */ -#undef BROKEN_TIOCGETC -#undef BROKEN_TIOCGWINSZ - /* This triggers a conditional in xfaces.c. */ #define XOS_NEEDS_TIME_H
--- a/src/s/usg5-4.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/s/usg5-4.h Thu Jul 10 15:26:15 2008 +0000 @@ -201,9 +201,7 @@ #endif #ifdef emacs -#ifndef NO_FILIO_H #include <sys/filio.h> -#endif #include <termio.h> #include <sys/ttold.h> #include <signal.h> @@ -283,9 +281,6 @@ if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \ fatal ("ioctl I_PUSH ttcompat", errno); -/* Tell x11term.c and keyboard.c we have the system V streams feature. */ -#define SYSV_STREAMS - /* This definition was suggested for next release. So give it a try. */ #define HAVE_SOCKETS
--- a/src/s/vms.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/s/vms.h Thu Jul 10 15:26:15 2008 +0000 @@ -151,7 +151,6 @@ #ifndef _GNUC_ extern double mth$dmod(double, double); -#define drem mth$dmod #endif /* Some time routines are missing in the VAX C RTL, or needs some @@ -240,10 +239,6 @@ #define NULL_DEVICE "NLA0:" -#define TERMCAP_NAME "emacs_library:[etc]termcap.dat" - -#define EXEC_SUFFIXES ".exe:.com" - /* Case conflict with Xlib XFree () */ #define xfree emacs_xfree
--- a/src/sysdep.c Thu Jul 10 15:25:35 2008 +0000 +++ b/src/sysdep.c Thu Jul 10 15:26:15 2008 +0000 @@ -135,18 +135,10 @@ #include "systty.h" #include "syswait.h" -#ifdef BROKEN_TIOCGWINSZ -#undef TIOCGWINSZ -#undef TIOCSWINSZ -#endif - #if defined (USG) #include <sys/utsname.h> #include <memory.h> #if defined (TIOCGWINSZ) -#ifdef NEED_SIOCTL -#include <sys/sioctl.h> -#endif #ifdef NEED_PTEM_H #include <sys/stream.h> #include <sys/ptem.h>
--- a/src/systty.h Thu Jul 10 15:25:35 2008 +0000 +++ b/src/systty.h Thu Jul 10 15:26:15 2008 +0000 @@ -118,10 +118,6 @@ /* Special cases - inhibiting the use of certain features. */ -#ifdef BROKEN_TIOCGETC -#undef TIOCGETC /* Avoid confusing some conditionals that test this. */ -#endif - /* Allow m- file to inhibit use of FIONREAD. */ #ifdef BROKEN_FIONREAD #undef FIONREAD