From 23bf9efbaa448c04f1a25106c9e394143d902697 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 20:10:49 +0000 Subject: (fileno): Don't define if already defined. --- lib-src/ntlib.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h index 523e3d6fd49..4dd9cae9796 100644 --- a/lib-src/ntlib.h +++ b/lib-src/ntlib.h @@ -90,7 +90,9 @@ int fchown (int fd, int uid, int gid); #define fcloseall _fcloseall #define fdopen _fdopen #define fgetchar _fgetchar +#ifndef fileno #define fileno _fileno +#endif #define flushall _flushall #define fputchar _fputchar #define getcwd _getcwd -- cgit v1.2.1 From 1a8fb4262f0bfaa1244885834feb8963dd615d6a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 20:40:00 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index aa9d3fe7fc6..196d2fe70dc 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2005-06-04 Eli Zaretskii + + * ntlib.h (fileno): Don't define if already defined. + 2005-05-25 Thien-Thi Nguyen * yow.c (setup_yow): Use EXIT_FAILURE in case no separators found. -- cgit v1.2.1 From 5a77c8e23c98b04eb8cd6161fe2363cb7cf987fc Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 12 Jun 2005 17:45:10 +0000 Subject: ($(DOC)): Depend on make-docfile.exe, temacs.exe, and the preloaded *.elc files. This avoids unnecessary dumping and DOC rebuilding. --- lib-src/ChangeLog | 6 ++++++ lib-src/makefile.w32-in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 196d2fe70dc..73641f765bf 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2005-06-12 Eli Zaretskii + + * makefile.w32-in ($(DOC)): Depend on make-docfile.exe, + temacs.exe, and the preloaded *.elc files. This avoids + unnecessary dumping and DOC rebuilding. + 2005-06-04 Eli Zaretskii * ntlib.h (fileno): Don't define if already defined. diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 0f806912be5..4df906064c5 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -248,7 +248,7 @@ lisp2 = \ DOC = DOC -$(DOC): make-docfile +$(DOC): $(THISDIR)/$(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2) - $(DEL) $(DOC) "$(THISDIR)/$(BLD)/make-docfile" -o $(DOC) -d ../src $(obj) "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1) -- cgit v1.2.1 From cb6ccbc94ba6387d2e94ef4ddb56912f01969744 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 13 Jun 2005 11:24:32 +0000 Subject: ($(DOC)): Fix last change. --- lib-src/makefile.w32-in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 4df906064c5..fbb5559fd80 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -248,7 +248,7 @@ lisp2 = \ DOC = DOC -$(DOC): $(THISDIR)/$(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2) +$(DOC): $(BLD) $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2) - $(DEL) $(DOC) "$(THISDIR)/$(BLD)/make-docfile" -o $(DOC) -d ../src $(obj) "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1) -- cgit v1.2.1 From 0e0dddda54491f07cb5a1b871eefd2517144361c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 13 Jun 2005 12:19:38 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 73641f765bf..ff62d4fc343 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2005-06-13 Eli Zaretskii + + * makefile.w32-in ($(DOC)): Fix last change. + 2005-06-12 Eli Zaretskii * makefile.w32-in ($(DOC)): Depend on make-docfile.exe, -- cgit v1.2.1