Commit 0e843971 authored by Dan Nicolaescu's avatar Dan Nicolaescu

emacs.c cleanups.

* src/emacs.c (emacs_copyright, emacs_version): Make static.
(Vinitial_window_system, Vauto_save_list_file_name)
(Vinhibit_redisplay): Remove declarations.
(main): Remove HAVE_SHM code, unused.  Remove _I386 conditional
for AIX.
parent 648801d1
2010-08-06 Dan Nicolaescu <dann@ics.uci.edu>
* emacs.c (emacs_copyright, emacs_version): Make static.
(Vinitial_window_system, Vauto_save_list_file_name)
(Vinhibit_redisplay): Remove declarations.
(main): Remove HAVE_SHM code, unused. Remove _I386 conditional
for AIX.
Use const for some arrays and functions.
* xterm.h (xg_set_icon_from_xpm_data):
* xfns.c (xg_set_icon_from_xpm_data):
......
......@@ -91,8 +91,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
#endif
const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
const char emacs_version[] = "24.0.50";
static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
static const char emacs_version[] = "24.0.50";
/* Make these values available in GDB, which doesn't see macros. */
......@@ -217,15 +217,6 @@ static unsigned long heap_bss_diff;
output a warning in dump-emacs. */
#define MAX_HEAP_BSS_DIFF (1024*1024)
#ifdef HAVE_WINDOW_SYSTEM
extern Lisp_Object Vinitial_window_system;
#endif /* HAVE_WINDOW_SYSTEM */
extern Lisp_Object Vauto_save_list_file_name;
extern Lisp_Object Vinhibit_redisplay;
/* Nonzero means running Emacs without interactive terminal. */
int noninteractive;
......@@ -864,23 +855,6 @@ main (int argc, char **argv)
}
#endif /* HAVE_PERSONALITY_LINUX32 */
/* Map in shared memory, if we are using that. */
#ifdef HAVE_SHM
if (argmatch (argv, argc, "-nl", "--no-shared-memory", 6, NULL, &skip_args))
{
map_in_data (0);
/* The shared memory was just restored, which clobbered this. */
skip_args = 1;
}
else
{
map_in_data (1);
/* The shared memory was just restored, which clobbered this. */
skip_args = 0;
}
#endif
#if defined (HAVE_SETRLIMIT) && defined (RLIMIT_STACK)
/* Extend the stack space available.
Don't do that if dumping, since some systems (e.g. DJGPP)
......@@ -1279,9 +1253,7 @@ main (int argc, char **argv)
#ifdef AIX
/* 20 is SIGCHLD, 21 is SIGTTIN, 22 is SIGTTOU. */
signal (SIGXCPU, fatal_error_signal);
#ifndef _I386
signal (SIGIOINT, fatal_error_signal);
#endif
signal (SIGGRANT, fatal_error_signal);
signal (SIGRETRACT, fatal_error_signal);
signal (SIGSOUND, fatal_error_signal);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment