summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-03-19 17:46:01 -0700
committerDan Nicolaescu <dann@ics.uci.edu>2010-03-19 17:46:01 -0700
commitaed71cf417ed73a53e1931d94d109070b3ed1041 (patch)
treebfd1b8e38bd3aa61fabd5d576f202e912d2617c2 /src/emacs.c
parentb0287b39f290209cfdc868775c1d90b8347aae47 (diff)
downloademacs-aed71cf417ed73a53e1931d94d109070b3ed1041.tar.gz
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.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c42
1 files changed, 0 insertions, 42 deletions
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,12 +2479,8 @@ 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);