aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorMiles Bader2005-01-02 09:13:19 +0000
committerMiles Bader2005-01-02 09:13:19 +0000
commitf1d34bcacd8dd9d730000f1fe8827559e1c89683 (patch)
tree9fd51451ad8b295052bf912ed49c73d7b4d1c9a3 /lib-src
parent0e9dd01c1246ee481efa3e71462d9db952072176 (diff)
parent553fd77e2511cdc4d1b45933f237c724ee72c3b9 (diff)
downloademacs-f1d34bcacd8dd9d730000f1fe8827559e1c89683.tar.gz
emacs-f1d34bcacd8dd9d730000f1fe8827559e1c89683.zip
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-81
Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-748 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-749 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-750 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-751 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-753 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-754 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-755 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-757 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-78 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-79 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-80 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-81 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82 Update from CVS
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/make-docfile.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d913fbaf2c9..92d06473a80 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
12004-12-26 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * make-docfile.c: Include stdlib.h even if WINDOWSNT is not
4 defined.
5
12004-12-15 Andreas Schwab <schwab@suse.de> 62004-12-15 Andreas Schwab <schwab@suse.de>
2 7
3 * etags.c (main): Fix typo in conversion of LONG_OPTIONS from 8 * etags.c (main): Fix typo in conversion of LONG_OPTIONS from
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index e502061b759..02ddbabe7a7 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -43,11 +43,11 @@ Boston, MA 02111-1307, USA. */
43#undef chdir 43#undef chdir
44 44
45#include <stdio.h> 45#include <stdio.h>
46#include <stdlib.h>
46#ifdef MSDOS 47#ifdef MSDOS
47#include <fcntl.h> 48#include <fcntl.h>
48#endif /* MSDOS */ 49#endif /* MSDOS */
49#ifdef WINDOWSNT 50#ifdef WINDOWSNT
50#include <stdlib.h>
51#include <fcntl.h> 51#include <fcntl.h>
52#include <direct.h> 52#include <direct.h>
53#endif /* WINDOWSNT */ 53#endif /* WINDOWSNT */