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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 324-352)

   - Merge from gnus--rel--5.10
   - Update from CVS
   - etc/emacs-buffer.gdb: Remove RCS keywords

 * gnus--rel--5.10  (patch 70-79)

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

2 files changed, 6 insertions, 0 deletions

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  <eliz@gnu.org>
+
+        * ntlib.h (fileno): Don't define if already defined.
+
 2005-05-25  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * yow.c (setup_yow): Use EXIT_FAILURE in case no separators found.
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