Mercurial > emacs
diff src/emacs.c @ 109361:8ee7c0cee7f9
Convert function definitions to standard C and some cleanups.
* src/emacs.c (__do_global_ctors, __do_global_ctors_aux)
(__do_global_dtors, __main): Use void in definition.
(main): Remove code dealing with SET_EMACS_PRIORITY, unused.
Remove SYMS_MACHINE code, unused. Remove SYMS_SYSTEM, inline
the only users from ...
* src/s/ms-w32.h (SYMS_SYSTEM): ... here and ...
* src/s/msdos.h (SYMS_SYSTEM): ... here. Remove.
(HAVE_VOLATILE): Remove, unused.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Mon, 12 Jul 2010 09:56:59 -0700 |
parents | 8f3464b85afb |
children | 89a16701cde1 |
line wrap: on
line diff
--- a/src/emacs.c Mon Jul 12 09:32:53 2010 -0700 +++ b/src/emacs.c Mon Jul 12 09:56:59 2010 -0700 @@ -606,11 +606,11 @@ (We don't have any real constructors or destructors.) */ #ifdef __GNUC__ #ifndef GCC_CTORS_IN_LIBC -void __do_global_ctors () +void __do_global_ctors (void) {} -void __do_global_ctors_aux () +void __do_global_ctors_aux (void) {} -void __do_global_dtors () +void __do_global_dtors (void) {} /* GNU/Linux has a bug in its library; avoid an error. */ #ifndef GNU_LINUX @@ -618,7 +618,7 @@ #endif char * __DTOR_LIST__[2] = { (char *) (-1), 0 }; #endif /* GCC_CTORS_IN_LIBC */ -void __main () +void __main (void) {} #endif /* __GNUC__ */ #endif /* ORDINARY_LINK */ @@ -957,12 +957,6 @@ } #endif /* MSDOS */ -#ifdef SET_EMACS_PRIORITY - if (emacs_priority) - nice (emacs_priority); - setuid (getuid ()); -#endif /* SET_EMACS_PRIORITY */ - /* Skip initial setlocale if LC_ALL is "C", as it's not needed in that case. The build procedure uses this while dumping, to ensure that the dumped Emacs does not have its system locale tables initialized, @@ -1646,6 +1640,9 @@ #ifdef MSDOS syms_of_xmenu (); + syms_of_dosfns(); + syms_of_msdos(); + syms_of_win16select(); #endif /* MSDOS */ #ifdef HAVE_NS @@ -1660,13 +1657,9 @@ syms_of_dbusbind (); #endif /* HAVE_DBUS */ -#ifdef SYMS_SYSTEM - SYMS_SYSTEM; -#endif - -#ifdef SYMS_MACHINE - SYMS_MACHINE; -#endif +#ifdef WINDOWSNT + syms_of_ntterm (); +#endif /* WINDOWSNT */ keys_of_casefiddle (); keys_of_cmds ();