From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sat, 20 Mar 2010 00:46:01 +0000 (-0700)
Subject: Remove obsolete uses of HAVE_SHM.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~709
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aed71cf417ed73a53e1931d94d109070b3ed1041;p=emacs.git

Remove obsolete uses of HAVE_SHM.
* emacs.c (standard_args):
(Fdump_emacs):
(syms_of_emacs): Remove code depending on HAVE_SHM.

* alloc.c: Remove HAVE_SHM dependent definition.

* Makefile.in (RUN_TEMACS): Do not depend on HAVE_SHM.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f15d91cbf91..799dab11529 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	Remove obsolete uses of HAVE_SHM.
+	* emacs.c (standard_args):
+	(Fdump_emacs):
+	(syms_of_emacs): Remove code depending on HAVE_SHM.
+
+	* alloc.c: Remove HAVE_SHM dependent definition.
+
+	* Makefile.in (RUN_TEMACS): Do not depend on HAVE_SHM.
+
 2010-03-18  Glenn Morris  <rgm@gnu.org>
 
 	* emacs.c (USAGE4): Hard-code bug address.
diff --git a/src/Makefile.in b/src/Makefile.in
index 5ac83e71e95..30b8be1ba56 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -853,11 +853,7 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \
    @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
    $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
 
-#ifdef HAVE_SHM
-RUN_TEMACS = `/bin/pwd`/temacs -nl
-#else
 RUN_TEMACS = `/bin/pwd`/temacs
-#endif
 
 all: emacs${EXEEXT} $(OTHER_FILES)
 
diff --git a/src/alloc.c b/src/alloc.c
index 9a935cc8952..98d60067f9e 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -257,8 +257,6 @@ Lisp_Object Vpurify_flag;
 
 Lisp_Object Vmemory_full;
 
-#ifndef HAVE_SHM
-
 /* Initialize it to a nonzero value to force it into data space
    (rather than bss space).  That way unexec will remap it into text
    space (pure), on some systems.  We have not implemented the
@@ -268,13 +266,6 @@ Lisp_Object Vmemory_full;
 EMACS_INT pure[(PURESIZE + sizeof (EMACS_INT) - 1) / sizeof (EMACS_INT)] = {1,};
 #define PUREBEG (char *) pure
 
-#else /* HAVE_SHM */
-
-#define pure PURE_SEG_BITS   /* Use shared memory segment */
-#define PUREBEG (char *)PURE_SEG_BITS
-
-#endif /* HAVE_SHM */
-
 /* Pointer to the pure area, and its size.  */
 
 static char *purebeg;
diff --git a/src/emacs.c b/src/emacs.c
index d7d01b8d3c1..dbaae9b040b 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1816,9 +1816,6 @@ struct standard_args
 const struct standard_args standard_args[] =
 {
   { "-version", "--version", 150, 0 },
-#ifdef HAVE_SHM
-  { "-nl", "--no-shared-memory", 140, 0 },
-#endif
   { "-t", "--terminal", 120, 1 },
   { "-nw", "--no-window-system", 110, 0 },
   { "-nw", "--no-windows", 110, 0 },
@@ -2210,39 +2207,6 @@ shut_down_emacs (sig, no_x, stuff)
 
 #ifndef CANNOT_DUMP
 
-#ifdef HAVE_SHM
-
-DEFUN ("dump-emacs-data", Fdump_emacs_data, Sdump_emacs_data, 1, 1, 0,
-       doc: /* Dump current state of Emacs into data file FILENAME.
-This function exists on systems that use HAVE_SHM.  */)
-     (filename)
-     Lisp_Object filename;
-{
-  extern char my_edata[];
-  Lisp_Object tem;
-
-  check_pure_size ();
-  CHECK_STRING (filename);
-  filename = Fexpand_file_name (filename, Qnil);
-
-  tem = Vpurify_flag;
-  Vpurify_flag = Qnil;
-
-  fflush (stdout);
-  /* Tell malloc where start of impure now is.  */
-  /* Also arrange for warnings when nearly out of space.  */
-#ifndef SYSTEM_MALLOC
-  memory_warnings (my_edata, malloc_warning);
-#endif
-  map_out_data (SDATA (filename));
-
-  Vpurify_flag = tem;
-
-  return Qnil;
-}
-
-#else /* not HAVE_SHM */
-
 DEFUN ("dump-emacs", Fdump_emacs, Sdump_emacs, 2, 2, 0,
        doc: /* Dump current state of Emacs into executable file FILENAME.
 Take symbols from SYMFILE (presumably the file you executed to run Emacs).
@@ -2339,8 +2303,6 @@ You must run Emacs in batch mode in order to dump it.  */)
   return unbind_to (count, Qnil);
 }
 
-#endif /* not HAVE_SHM */
-
 #endif /* not CANNOT_DUMP */
 
 #if HAVE_SETLOCALE
@@ -2517,11 +2479,7 @@ syms_of_emacs ()
   staticpro (&Qfile_name_handler_alist);
 
 #ifndef CANNOT_DUMP
-#ifdef HAVE_SHM
-  defsubr (&Sdump_emacs_data);
-#else
   defsubr (&Sdump_emacs);
-#endif
 #endif
 
   defsubr (&Skill_emacs);