* s/vms.h:

* s/usg5-4-2.h:
* s/sol2-5.h:
* s/freebsd.h:
* s/darwin.h: Remove dead code.

6 files changed, 6 insertions, 33 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 993e21fdae4..d648b8a90d0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2008-07-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* s/vms.h:
+	* s/usg5-4-2.h:
+	* s/sol2-5.h:
+	* s/freebsd.h:
+	* s/darwin.h: Remove dead code.
+
 	* m/template.h:
 	* m/sparc.h:
 	* m/mips.h:
diff --git a/src/s/darwin.h b/src/s/darwin.h
index aa509b75af5..4e282e99a9d 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -30,13 +30,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define BSD_SYSTEM
 /* #define VMS */
 
-#if 0 /* Don't define DARWIN on Mac OS X because CoreFoundation.h uses
-	 it to distinguish Mac OS X from bare Darwin.  */
-#ifndef	DARWIN
-#define	DARWIN 1
-#endif
-#endif
-
 /* MAC_OS is used to conditionally compile code common to both MAC_OS8
    and MAC_OSX.  */
 #ifdef MAC_OSX
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 843a34b6fe0..11df2001f86 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -114,9 +114,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define HAVE_WAIT_HEADER
 #define HAVE_GETLOADAVG 1
-#if 0
-#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
-#endif
 #define HAVE_TERMIOS
 #define NO_TERMIO
 #define DECLARE_GETPWUID_WITH_UID_T
@@ -135,16 +132,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define BSD_SYSTEM 199506
 #endif
 
-#if 0  /* Shouldn't be necessary and produces warnings with the
-          experimental Autoconf test.  */
-#define WAITTYPE int
-/* get this since it won't be included if WAITTYPE is defined */
-#ifdef emacs
-#include <sys/wait.h>
-#endif
-#define WRETCODE(w) (_W_INT(w) >> 8)
-#endif
-
 /* Don't close pty in process.c to make it as controlling terminal.
    It is already a controlling terminal of subprocess, because we did
    ioctl TIOCSCTTY.  */
diff --git a/src/s/sol2-5.h b/src/s/sol2-5.h
index e02f0b82bc0..90163987e69 100644
--- a/src/s/sol2-5.h
+++ b/src/s/sol2-5.h
@@ -2,10 +2,6 @@
 
 #include "sol2-4.h"
 
-#if 0 /* Klaus Zeitler <kzeitler@lucent.com> says SIGIO still fails.  */
-#undef BROKEN_SIGIO
-#endif
-
 /* -lgen is needed for the regex and regcmp functions
    which are used by Motif.  In the future we can try changing
    regex.c to provide them in Emacs, but this is safer for now.  */
diff --git a/src/s/usg5-4-2.h b/src/s/usg5-4-2.h
index c7ab09a7032..c6ee7ac5d32 100644
--- a/src/s/usg5-4-2.h
+++ b/src/s/usg5-4-2.h
@@ -23,10 +23,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* fnf@cygnus.com says these exist.  */
 #define HAVE_TCATTR
-#if 0 /* autoconf should take care of this.  */
-#define HAVE_GETHOSTNAME
-#define HAVE_RANDOM
-#endif
 /* #define HAVE_GETWD  (appears to be buggy on SVR4.2) */
 #undef HAVE_GETWD
 
diff --git a/src/s/vms.h b/src/s/vms.h
index 3e7ad89ecfc..78e82736a68 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -210,11 +210,6 @@ extern double mth$dmod(double, double);
 /* Case conflicts with C library srandom. */
 #define Srandom S_random
 
-/* variable length too long... maybe */
-#if 0
-#define do_line_insertion_deletion_costs do_line_insertion_deletion_cost
-#endif
-
 /* Cause initialization of vmsfns.c to be run.  */
 #define SYMS_SYSTEM syms_of_vmsfns ()