Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-23

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0  (patch 150-165)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Add info/dir to arch branch

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 34-37)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

2 files changed, 5 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4ffa38482cf..0978e8835ca 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * make-docfile.c: Undo previous change.
+
 2005-02-04  Andreas Schwab  <schwab@suse.de>
 
         * movemail.c (fatal): Accept third parameter and pass down to
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 02ddbabe7a7..e502061b759 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -43,11 +43,11 @@ Boston, MA 02111-1307, USA.  */
 #undef chdir
 
 #include <stdio.h>
-#include <stdlib.h>
 #ifdef MSDOS
 #include <fcntl.h>
 #endif /* MSDOS */
 #ifdef WINDOWSNT
+#include <stdlib.h>
 #include <fcntl.h>
 #include <direct.h>
 #endif /* WINDOWSNT */