(Fget_char_property_and_overlay): Doc fix.

[gnu-emacs] / lib-src / ntlib.h

diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 385db6dba64c23b24449376ff6cc93343a3f641e..96862aa334b5428b98da2d9ac033439e126cec03 100644 (file)
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -1,5 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
@@ -15,13 +16,11 @@
 
    You should have received a copy of the GNU General Public License
    along with GNU Emacs; see the file COPYING.  If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
 
 */
 
-#define WIN32
-
 #include <pwd.h>
 #include <malloc.h>
 
@@ -34,7 +33,7 @@
 #ifdef sleep
 #undef sleep
 #endif
-void sleep(int seconds);
+void sleep(unsigned long seconds);
 char *getwd (char *dir);
 int getppid(void);
 char * getlogin ();
@@ -51,7 +50,7 @@ int fchown (int fd, int uid, int gid);
 #define bcmp(a, b, l) memcmp(a, b, l)
 #endif
 
-/* redirect or undo interceptions by config.h */
+/* redirect or undo interceptions created by config.h */
 #undef access
 #define access  _access
 #undef chdir
@@ -92,7 +91,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
@@ -111,4 +112,11 @@ int fchown (int fd, int uid, int gid);
 #define index     strchr
 #define rindex    strrchr
 
+/* Make standard winsock definitions available if needed.  */
+#undef _WINSOCKAPI_
+#undef _WINSOCK_H
+
 /* end of ntlib.h */
+
+/* arch-tag: 93444f66-7b98-4aa5-a5cd-01444094af28
+   (do not change this comment) */