[Emacs-diffs] /srv/bzr/emacs/trunk r109540: Remove some make-docfile.c undes that are no longer needed

[Glenn Morris]

------------------------------------------------------------
revno: 109540
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-08-09 20:16:33 -0400
message:
  Remove some make-docfile.c undes that are no longer needed
  
  * lib-src/make-docfile.c (main):
  (fopen) [!WINDOWSNT]:
  (chdir) [!DOS_NT]: No more need to undef.
modified:
  lib-src/ChangeLog
  lib-src/make-docfile.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-08-10 00:02:10 +0000
+++ b/lib-src/ChangeLog 2012-08-10 00:16:33 +0000
@@ -1,5 +1,9 @@
 2012-08-10  Glenn Morris  <address@hidden>
 
+       * make-docfile.c (main):
+       (fopen) [!WINDOWSNT]:
+       (chdir) [!DOS_NT]: No more need to undef.
+
        * movemail.c (DIRECTORY_SEP, IS_DIRECTORY_SEP):
        * make-docfile.c (DIRECTORY_SEP, IS_DIRECTORY_SEP):
        * emacsclient.c (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP):

=== modified file 'lib-src/make-docfile.c'
--- a/lib-src/make-docfile.c    2012-08-10 00:02:10 +0000
+++ b/lib-src/make-docfile.c    2012-08-10 00:16:33 +0000
@@ -36,23 +36,26 @@
 
 #include <config.h>
 
-/* Defined to be emacs_main, sys_fopen, etc. in config.h.  */
-/* FIXME Not for ages? */
-#undef main
+#include <stdio.h>
+#include <stdlib.h>   /* config.h unconditionally includes this anyway */
+#ifdef MSDOS
+#include <fcntl.h>
+#endif /* MSDOS */
+#ifdef WINDOWSNT
+/* Defined to be sys_fopen in ms-w32.h, but only #ifdef emacs, so this
+   is really just insurance.  */
 #undef fopen
-#undef chdir
-
-#include <stdio.h>
-#include <stdlib.h>       /* FIXME config.h unconditionally includes this */
-#ifdef MSDOS
-#include <fcntl.h>
-#endif /* MSDOS */
-#ifdef WINDOWSNT
 #include <fcntl.h>
 #include <direct.h>
 #endif /* WINDOWSNT */
 
 #ifdef DOS_NT
+/* Defined to be sys_chdir in ms-w32.h, but only #ifdef emacs, so this
+   is really just insurance.
+
+   Similarly, msdos defines this as sys_chdir, but we're not linking with the
+   file where that function is defined.  */
+#undef chdir
 #define READ_TEXT "rt"
 #define READ_BINARY "rb"
 #else  /* not DOS_NT */
@@ -73,14 +76,6 @@
 static void start_globals (void);
 static void write_globals (void);
 
-/* FIXME msdos does not define this any more, and in any case we
-   undefined it for everyone just above.  */
-#ifdef MSDOS
-/* s/msdos.h defines this as sys_chdir, but we're not linking with the
-   file where that function is defined.  */
-#undef chdir
-#endif
-
 #include <unistd.h>
 
 /* Stdio stream for output to the DOC file.  */