--- a/src/s/linux.h	Mon Aug 13 10:16:17 2007 +0200
+++ b/src/s/linux.h	Mon Aug 13 10:17:07 2007 +0200
@@ -23,10 +23,7 @@
 
 /* This file was put together by Michael K. Johnson and Rik Faith.  */
 
-/* #define UNIPLUS */
-/* #define USG5 */
 #define USG
-/* #define BSD */
 #define LINUX
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
@@ -66,12 +63,6 @@
 #define INTERRUPTIBLE_CLOSE
 #define INTERRUPTIBLE_IO
 
-/* If you mount the proc file system somewhere other than /proc
-   you will have to uncomment the following and make the proper
-   changes */
-
-/* #define LINUX_LDAV_FILE "/proc/loadavg" */
-
 /* This is needed for dispnew.c:update_frame */
 
 #ifndef NOT_C_CODE
@@ -117,17 +108,6 @@
 #define LIB_STANDARD "-lgcc -lc -lgcc /usr/lib/crtn.o"
 #endif
 
-/* Don't use -g in test compiles in configure.
-   This is so we will use the same shared libs for that linking
-   that are used when linking temacs.  */
-#ifdef THIS_IS_CONFIGURE
-#define C_DEBUG_SWITCH
-#endif
-
-/* Let's try this out, just in case.
-   Nah.  Rik Faith <faith@cs.unc.edu> says it doesn't work well.  */
-/* #define SIGNALS_VIA_CHARACTERS */
-
 #ifdef TERM
 #define LIBS_SYSTEM "-lclient"
      /* #define C_SWITCH_SYSTEM "-D_BSD_SOURCE -I/usr/src/term" - mrb */
@@ -136,14 +116,8 @@
 /* alane@wozzle.linet.org says that -lipc is not a separate library,
    since libc-4.4.1.  So -lipc was deleted.  */
 #define LIBS_SYSTEM
-     /* #define _BSD_SOURCE 1 - mrb */
 #endif
 
-
-/* XEmacs change: configure doesn't find this because math.h aliases
-   rint to __rint so that it's not found. */
-#define HAVE_RINT 1
-
 #ifdef __ELF__
 #define UNEXEC "unexelf.o"
 #define UNEXEC_USE_MAP_PRIVATE