3 files changed, 8 insertions, 55 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8d6aeeac399..d85ed8405b7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2008-07-16  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * s/usg5-4.h (HAVE_SYSVIPC): Remove, unused.
+        (USG_SHARED_LIBRARIES): Remove, only used in unexec.c which is not
+        used by this configuration.
+        * emacs.c: Remove code depending on USG_SHARED_LIBRARIES.
+        * unexec.c: Remove code depending on HPUX and
+        USG_SHARED_LIBRARIES, not used with this file.  Remove code
+        depending on IRIS, unused.  Remove if 0-ed code.
+
         * s/template.h: Remove comments about static.
 
         * sysdep.c: Remove code depending on NEED_PTEM_H, unused.  Remove
diff --git a/src/emacs.c b/src/emacs.c
index 869bdef24c4..35b2fada91f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -226,13 +226,6 @@ extern Lisp_Object Vauto_save_list_file_name;
 
 extern Lisp_Object Vinhibit_redisplay;
 
-#ifdef USG_SHARED_LIBRARIES
-/* If nonzero, this is the place to put the end of the writable segment
-   at startup.  */
-
-unsigned int bss_end = 0;
-#endif
-
 /* Nonzero means running Emacs without interactive terminal.  */
 
 int noninteractive;
@@ -1006,11 +999,6 @@ main (argc, argv
   /* Record (approximately) where the stack begins.  */
   stack_bottom = &stack_bottom_variable;
 
-#ifdef USG_SHARED_LIBRARIES
-  if (bss_end)
-    brk ((void *)bss_end);
-#endif
-
   clearerr (stdin);
 
 #ifndef SYSTEM_MALLOC
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 4cc8bed90be..4c2a59cc27d 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -34,10 +34,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define SYSTEM_TYPE "usg-unix-v"
 
-/* Default is to set interrupt_input to 0: don't do input buffering within Emacs */
-
-/* #define INTERRUPT_INPUT */
-
 /*
  *      Define HAVE_TERMIO if the system provides sysV-style ioctls
  *      for terminal control.
@@ -49,20 +45,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  *      Define HAVE_PTYS if the system supports pty devices.
  */
 
-/* Some versions of V.3 have this, but not all.
-   #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.
- */
-
-/* #define NONSYSTEM_DIR_LIBRARY */
-
 /*
  *      Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir
  *      library functions.  Almost, but not quite the same as
@@ -70,10 +52,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  */
 #define SYSV_SYSTEM_DIR
 
-/* 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).
@@ -81,19 +59,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define subprocesses
 
-/* 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 */
-
 /* The file containing the kernel's symbol table is called /unix.  */
 
 #define KERNEL_FILE "/unix"
@@ -103,10 +68,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define LDAV_SYMBOL "avenrun"
 
-/* Define this if system V IPC is available.  */
-
-#define HAVE_SYSVIPC
-
 /* Special hacks needed to make Emacs run on this system.  */
 
 /*
@@ -151,10 +112,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define BSTRING
 #endif /* HAVE_X_WINDOWS */
 
-/* Enable support for shared libraries in unexec.  */
-
-#define USG_SHARED_LIBRARIES
-
 /* On USG systems signal handlers return void */
 
 #define SIGTYPE void