[Emacs-diffs] /srv/bzr/emacs/trunk r100793: Convert function definitions to standard C and some cleanups.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100793
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Mon 2010-07-12 09:56:59 -0700
message:
  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.
modified:
  src/ChangeLog
  src/emacs.c
  src/s/ms-w32.h
  src/s/msdos.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-12 16:32:53 +0000
+++ b/src/ChangeLog     2010-07-12 16:56:59 +0000
@@ -1,5 +1,17 @@
 2010-07-12  Dan Nicolaescu  <address@hidden>
 
+
+       * process.c (close_process_descs): Use DOS_NT instead of WINDOWSNT.
+
+       * 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 ...
+       * s/ms-w32.h (SYMS_SYSTEM): ... here and ...
+       * s/msdos.h (SYMS_SYSTEM): ... here.  Remove.
+       (HAVE_VOLATILE): Remove, unused.
+
        Convert more function definitions to standard C.
        * xdisp.c (window_box_edges, handle_single_display_spec)
        (display_string): Convert definition to standard C.

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2010-07-11 10:31:10 +0000
+++ b/src/emacs.c       2010-07-12 16:56:59 +0000
@@ -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_aux ()
-{}
-void __do_global_dtors ()
+void __do_global_ctors (void)
+{}
+void __do_global_ctors_aux (void)
+{}
+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 ();

=== modified file 'src/s/ms-w32.h'
--- a/src/s/ms-w32.h    2010-07-11 10:31:10 +0000
+++ b/src/s/ms-w32.h    2010-07-12 16:56:59 +0000
@@ -40,7 +40,6 @@
 /* SYSTEM_TYPE should indicate the kind of system you are using.
    It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "windows-nt"
-#define SYMS_SYSTEM syms_of_ntterm ()
 
 #define NO_MATHERR 1
 

=== modified file 'src/s/msdos.h'
--- a/src/s/msdos.h     2010-07-08 03:03:52 +0000
+++ b/src/s/msdos.h     2010-07-12 16:56:59 +0000
@@ -38,14 +38,8 @@
    It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "ms-dos"
 
-#define SYMS_SYSTEM syms_of_dosfns();syms_of_msdos();syms_of_win16select()
-
 #define SYSV_SYSTEM_DIR
 
-/* Define this is the compiler understands `volatile'.  */
-#define HAVE_VOLATILE
-
-
 /* subprocesses should be defined if you want to have code for
    asynchronous subprocesses (as used in M-x compile and M-x shell).
    This is the only system that needs this.  */