From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 4 Jun 2005 20:10:49 +0000 (+0000)
Subject: (fileno): Don't define if already defined.
X-Git-Tag: emacs-pretest-22.0.90~9308
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=23bf9efbaa448c04f1a25106c9e394143d902697;p=emacs.git

(fileno): Don't define if already defined.
---

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
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 709b32f1452..998c1f7cf05 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -354,7 +354,9 @@ Boston, MA 02111-1307, USA.  */
 #define fcloseall _fcloseall
 #define fdopen	  _fdopen
 #define fgetchar  _fgetchar
+#ifndef fileno
 #define fileno	  _fileno
+#endif
 #define flushall  _flushall
 #define fputchar  _fputchar
 #define fsync	  _commit