8 files changed, 82 insertions, 24 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 95203b9d2fa..ae6cb231614 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,34 @@
+2012-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * gmake.defs (SWITCHCHAR): Define to // under MSYS, / otherwise.
+        (Bug#12955)
+
+        * nmake.defs (SWITCHCHAR): Define to /.
+
+2012-11-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume POSIX 1003.1-1988 or later for dirent.h (Bug#12958).
+        * inc/dirent.h: Rename from ../src/ndir.h, with these changes:
+        (struct dirent): Rename from struct direct.  All uses changed.
+        * inc/sys/dir.h: Remove.
+
+2012-11-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume POSIX 1003.1-1988 or later for unistd.h (Bug#12945).
+        * config.nt (HAVE_GETCWD): Remove.
+
+2012-11-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * nmake.defs: Use !if, not !ifdef.  For the details, see
+        http://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00027.html
+
+        * inc/stdint.h (INTPTR_MIN):
+        (PTRDIFF_MIN) [!__GNUC__]: Define for MSVC.
+
+2012-11-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/unistd.h: Don't include fcntl.h and don't define O_RDWR.
+
 2012-11-17  Juanma Barranquero  <lekktu@gmail.com>
 
         * config.nt: Sync with autogen/config.in.
diff --git a/nt/config.nt b/nt/config.nt
index 57c18ad2789..1adcbca89be 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -411,12 +411,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `getaddrinfo' function. */
 #undef HAVE_GETADDRINFO
 
-/* Define to 1 if you have the `getcwd' function.
-   If you think about defining HAVE_GETCWD, don't: the alternative
-   getwd is redefined on w32.c, and does not really return the current
-   directory, to get the desired results elsewhere in Emacs.  */
-#undef HAVE_GETCWD
-
 /* Define to 1 if you have the `getdelim' function. */
 #undef HAVE_GETDELIM
 
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 358c262db28..3d545fab975 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -69,10 +69,18 @@ sh_output := $(shell echo)
 ifeq "$(findstring ECHO, $(sh_output))" "ECHO"
 THE_SHELL = $(COMSPEC)$(ComSpec)
 SHELLTYPE=CMD
+SWITCHCHAR=/
 else
 USING_SH = 1
 THE_SHELL = $(SHELL)
 SHELLTYPE=SH
+# MSYS needs to double the slash in cmd-style switches to avoid
+# interpreting /x as a Posix style file name reference
+ifneq ($(MSYSTEM),)
+SWITCHCHAR=//
+else
+SWITCHCHAR=/
+endif
 endif
 
 MAKETYPE=gmake
diff --git a/nt/inc/dirent.h b/nt/inc/dirent.h
new file mode 100644
index 00000000000..618f3beddf0
--- /dev/null
+++ b/nt/inc/dirent.h
@@ -0,0 +1,38 @@
+/*
+        <dirent.h> -- definitions for POSIX-compatible directory access
+
+ * The code here is forced by the interface, and is not subject to
+ * copyright, constituting the only possible expression of the
+ * algorithm in this format.
+ */
+
+#define DIRBLKSIZ       512             /* size of directory block */
+#ifdef WINDOWSNT
+#define MAXNAMLEN       255
+#else  /* not WINDOWSNT */
+#define MAXNAMLEN       15              /* maximum filename length */
+#endif /* not WINDOWSNT */
+        /* NOTE:  MAXNAMLEN must be one less than a multiple of 4 */
+
+struct dirent                           /* data from readdir() */
+        {
+        long            d_ino;          /* inode number of entry */
+        unsigned short  d_reclen;       /* length of this record */
+        unsigned short  d_namlen;       /* length of string in d_name */
+        char            d_name[MAXNAMLEN+1];    /* name of file */
+        };
+
+typedef struct
+        {
+        int     dd_fd;                  /* file descriptor */
+        int     dd_loc;                 /* offset in block */
+        int     dd_size;                /* amount of valid data */
+        char    dd_buf[DIRBLKSIZ];      /* directory block */
+        }       DIR;                    /* stream data from opendir() */
+
+extern DIR              *opendir (char *);
+extern struct dirent    *readdir (DIR *);
+extern void             seekdir (DIR *, long);
+extern void             closedir (DIR *);
+
+#define rewinddir( dirp )       seekdir( dirp, 0L )
diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h
index 5c53fa18b55..97c9bbdaee9 100644
--- a/nt/inc/stdint.h
+++ b/nt/inc/stdint.h
@@ -37,6 +37,7 @@ typedef unsigned __int64 uint64_t;
 #define INT64_MAX 9223372036854775807i64
 #define INT64_MIN (~INT64_MAX)
 #define INTPTR_MAX INT64_MAX
+#define INTPTR_MIN INT64_MIN
 #define UINTMAX_MAX UINT64_MAX
 #define UINTMAX_MIN UINT64_MIN
 #define INTMAX_MAX INT64_MAX
@@ -51,6 +52,7 @@ typedef unsigned int uint32_t;
 #define INT32_MAX 2147483647
 #define INT32_MIN (~INT32_MAX)
 #define INTPTR_MAX INT32_MAX
+#define INTPTR_MIN INT32_MIN
 #define UINTMAX_MAX UINT32_MAX
 #define UINTMAX_MIN UINT32_MIN
 #define INTMAX_MAX INT32_MAX
@@ -60,6 +62,7 @@ typedef unsigned int uint32_t;
 #endif
 
 #define PTRDIFF_MAX INTPTR_MAX
+#define PTRDIFF_MIN INTPTR_MIN
 
 #endif  /* !__GNUC__ */
 
diff --git a/nt/inc/sys/dir.h b/nt/inc/sys/dir.h
deleted file mode 100644
index dc075cd7587..00000000000
--- a/nt/inc/sys/dir.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * map sys\dir.h to ..\..\..\src\ndir.h
- */
-
-#include "..\..\..\src\ndir.h"
-
diff --git a/nt/inc/unistd.h b/nt/inc/unistd.h
index 0173fdbb943..e751ed124d3 100644
--- a/nt/inc/unistd.h
+++ b/nt/inc/unistd.h
@@ -26,17 +26,6 @@ extern int faccessat (int, char const *, int, int);
 #define AT_EACCESS 4
 #define AT_SYMLINK_NOFOLLOW 4096
 
-/* Here are some more fcntl.h macros that default to gnulib-compatible
-   values.  Include <fcntl.h> first, to make sure we don't override
-   its values if any.  FIXME: If we know <fcntl.h> does not define
-   O_NOCTTY and O_RDWR, this can be replaced with a simple "#define
-   O_NOCTTY 0" and "#define O_RDWR 2".  */
-#include <fcntl.h>
-#ifndef O_NOCTTY
 #define O_NOCTTY 0
-#endif
-#ifndef O_RDWR
-#define O_RDWR 2
-#endif
 
 #endif  /* _UNISTD_H */
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 48809afc771..2c6bc66b673 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -22,6 +22,7 @@ all:
 

 THE_SHELL = $(COMSPEC)

 SHELLTYPE=CMD

+SWITCHCHAR=/

 

 MAKETYPE=nmake

 

@@ -116,7 +117,7 @@ RC_INCLUDE	= -i
 

 USE_CRT_DLL     = 1

 

-!ifdef USE_CRT_DLL

+!if USE_CRT_DLL

 libc            = msvcrt$(D).lib

 EMACS_EXTRA_C_FLAGS= -D_DLL -D_MT -DUSE_CRT_DLL=1

 !else