Mercurial > emacs

changeset 63018:e50e8a19d938

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(fileno): Don't define if already defined.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 04 Jun 2005 20:10:49 +0000
parents 1ed6054e7e74
children 2d45521f8f6d
files lib-src/ntlib.h src/s/ms-w32.h
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lib-src/ntlib.h	Sat Jun 04 20:09:13 2005 +0000
+++ b/lib-src/ntlib.h	Sat Jun 04 20:10:49 2005 +0000
@@ -90,7 +90,9 @@
 #define fcloseall _fcloseall
 #define fdopen	  _fdopen
 #define fgetchar  _fgetchar
+#ifndef fileno
 #define fileno	  _fileno
+#endif
 #define flushall  _flushall
 #define fputchar  _fputchar
 #define getcwd	  _getcwd
--- a/src/s/ms-w32.h	Sat Jun 04 20:09:13 2005 +0000
+++ b/src/s/ms-w32.h	Sat Jun 04 20:10:49 2005 +0000
@@ -354,7 +354,9 @@
 #define fcloseall _fcloseall
 #define fdopen	  _fdopen
 #define fgetchar  _fgetchar
+#ifndef fileno
 #define fileno	  _fileno
+#endif
 #define flushall  _flushall
 #define fputchar  _fputchar
 #define fsync	  _commit