* 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.

11 files changed, 2 insertions, 42 deletions

diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 2b31e2c8167..9c075ead658 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -176,10 +176,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    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
 
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 11df2001f86..779d944b6f6 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -91,8 +91,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 660462a679d..39b9db496fc 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -43,7 +43,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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.  */
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 8ea24fc4dc8..8411f74191b 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -227,16 +227,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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
diff --git a/src/s/hpux11.h b/src/s/hpux11.h
index 7bd4afb116b..3382395a90f 100644
--- a/src/s/hpux11.h
+++ b/src/s/hpux11.h
@@ -1,7 +1,5 @@
 #include "hpux10-20.h"
 
-#define HPUX11
-
 #ifdef POSIX_SIGNALS
 #undef POSIX_SIGNALS
 #endif
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 0e9b0a8443d..951e00091fc 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -72,8 +72,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* 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 */
diff --git a/src/s/sol2-3.h b/src/s/sol2-3.h
index 3473eec4cb3..3adad4bf11a 100644
--- a/src/s/sol2-3.h
+++ b/src/s/sol2-3.h
@@ -21,9 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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
diff --git a/src/s/sol2-4.h b/src/s/sol2-4.h
index 8ac97eaa6df..3cf2786c500 100644
--- a/src/s/sol2-4.h
+++ b/src/s/sol2-4.h
@@ -2,8 +2,6 @@
 
 #include "sol2-3.h"
 
-#define SOLARIS2_4
-
 /* Get rid of -traditional and let const really do its thing.  */
 
 #ifdef __GNUC__
diff --git a/src/s/sol2.h b/src/s/sol2.h
index 10733de1d0b..aa30be3675c 100644
--- a/src/s/sol2.h
+++ b/src/s/sol2.h
@@ -22,11 +22,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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
 
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index a0309d7439a..84c357c02a2 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -201,9 +201,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   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
diff --git a/src/s/vms.h b/src/s/vms.h
index 78e82736a68..413c302e8c7 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -151,7 +151,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 @@ globalref char sdata[];
 
 #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