Support MSVC build with newer versions of Visual Studio.

Small portions of the changes by Fabrice Popineau <fabrice.popineau@supelec.fr>.

 src/makefile.w32-in (TAGS-gmake): Don't use $(patsubst ...), as
 Nmake barfs on that.  Use $(OBJ*_c) variables instead, defined on
 nt/gmake.defs.
 src/lisp.h (ENUM_BF): New macro, for enumerated types in bitfields,
 which are not supported by MSVC.
 (Lisp_Symbol, Lisp_Misc_Any, Lisp_Marker, Lisp_Misc_Overlay)
 (Lisp_Save_Value, Lisp_Free): Use ENUM_BF for enumerated types in
 bitfields.
 (Lisp_Object) [USE_LISP_UNION_TYPE]: Use ENUM_BF for enumerated
 types in bitfields.
 (DEFUN) [_MSC_VER]: Define in a different way for MSVC.
 src/w32fns.c [_MSC_VER]: DECLARE_HANDLE for any MSVC version.
 src/w32.c: Don't include w32api.h for MSVC.
 (init_environment) [_MSC_VER]: Call sys_access, not _access.
 src/s/ms-w32.h <sigset_t, ssize_t> [_MSC_VER]: Typedefs for MSVC.
 [_MSC_VER]: Include sys/timeb.h, sys/stat.h, and signal.h.
 (fstat, stat, utime) [_MSC_VER]: Redirect to their sys_* cousins.
 (malloc, free, realloc, calloc) [_MSC_VER]: Always redirect to the
 e_* cousins.
 (alloca) [_MSC_VER]: Define to _alloca.
 src/lisp.h (DECL_ALIGN) [_MSC_VER]: Define for MSVC.
 src/regex.c <re_char> [_MSC_VER]: A separate definition for MSVC.
 nt/makefile.w32-in (clean-other-dirs-nmake)
 (distclean-other-dirs-nmake, maintainer-clean-other-dirs-nmake):
 Update for current structure of doc/ subdirectories.
 nt/gmake.defs (OBJ0_c, OBJ1_c, OBJ2_c): New variables.
 nt/INSTALL: Update for newer versions of MSVC.
 lib/makefile.w32-in (FRC): New dummy target.
 (TAGS): Depend on FRC.

Fixes: debbugs:9960

7 files changed, 116 insertions, 23 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 624ad71379d..83e6154fb5f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,38 @@
+2011-11-05  Eli Zaretskii  <eliz@gnu.org>
+
+        Support MSVC build with newer versions of Visual Studio.
+        * makefile.w32-in (TAGS-gmake): Don't use $(patsubst ...), as
+        Nmake barfs on that.  Use $(OBJ*_c) variables instead, defined on
+        nt/gmake.defs.
+
+        * lisp.h (ENUM_BF): New macro, for enumerated types in bitfields,
+        which are not supported by MSVC.
+        (Lisp_Symbol, Lisp_Misc_Any, Lisp_Marker, Lisp_Misc_Overlay)
+        (Lisp_Save_Value, Lisp_Free): Use ENUM_BF for enumerated types in
+        bitfields.
+        (Lisp_Object) [USE_LISP_UNION_TYPE]: Use ENUM_BF for enumerated
+        types in bitfields.
+        (DEFUN) [_MSC_VER]: Define in a different way for MSVC.
+
+        * w32fns.c [_MSC_VER]: DECLARE_HANDLE for any MSVC version.
+
+2011-11-05  Fabrice Popineau  <fabrice.popineau@supelec.fr> (tiny change)
+
+        Support MSVC build with newer versions of Visual Studio.
+        * w32.c: Don't include w32api.h for MSVC.
+        (init_environment) [_MSC_VER]: Call sys_access, not _access.
+
+        * s/ms-w32.h <sigset_t, ssize_t> [_MSC_VER]: Typedefs for MSVC.
+        [_MSC_VER]: Include sys/timeb.h, sys/stat.h, and signal.h.
+        (fstat, stat, utime) [_MSC_VER]: Redirect to their sys_* cousins.
+        (malloc, free, realloc, calloc) [_MSC_VER]: Always redirect to the
+        e_* cousins.
+        (alloca) [_MSC_VER]: Define to _alloca.
+
+        * lisp.h (DECL_ALIGN) [_MSC_VER]: Define for MSVC.
+
+        * regex.c <re_char> [_MSC_VER]: A separate definition for MSVC.
+
 2011-11-04  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (note_mouse_highlight): If either of
diff --git a/src/lisp.h b/src/lisp.h
index df8812f73b7..f3c704bc763 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -168,6 +168,9 @@ extern int suppress_checking EXTERNALLY_VISIBLE;
 #  if HAVE_ATTRIBUTE_ALIGNED
 #   define DECL_ALIGN(type, var) \
      type __attribute__ ((__aligned__ (1 << GCTYPEBITS))) var
+#  elif defined(_MSC_VER)
+#   define DECL_ALIGN(type, var) \
+     type __declspec(align(1 << GCTYPEBITS)) var
 #  else
      /* What directives do other compilers use?  */
 #  endif
@@ -225,6 +228,15 @@ extern int suppress_checking EXTERNALLY_VISIBLE;
 # endif
 #endif
 
+/* Stolen from GDB.  The only known compiler that doesn't support
+   enums in bitfields is MSVC.  */
+#ifdef _MSC_VER
+#define ENUM_BF(TYPE) unsigned int
+#else
+#define ENUM_BF(TYPE) enum TYPE
+#endif
+
+
 enum Lisp_Type
   {
     /* Integer.  XINT (obj) is the integer value.  */
@@ -315,12 +327,12 @@ union Lisp_Object
         /* Use explict signed, the signedness of a bit-field of type
            int is implementation defined.  */
         signed EMACS_INT val  : VALBITS;
-        enum Lisp_Type type : GCTYPEBITS;
+        ENUM_BF (Lisp_Type) type : GCTYPEBITS;
       } s;
     struct
       {
         EMACS_UINT val : VALBITS;
-        enum Lisp_Type type : GCTYPEBITS;
+        ENUM_BF (Lisp_Type) type : GCTYPEBITS;
       } u;
   }
 Lisp_Object;
@@ -336,14 +348,14 @@ union Lisp_Object
 
     struct
       {
-        enum Lisp_Type type : GCTYPEBITS;
+        ENUM_BF (Lisp_Type) type : GCTYPEBITS;
         /* Use explict signed, the signedness of a bit-field of type
            int is implementation defined.  */
         signed EMACS_INT val  : VALBITS;
       } s;
     struct
       {
-        enum Lisp_Type type : GCTYPEBITS;
+        ENUM_BF (Lisp_Type) type : GCTYPEBITS;
         EMACS_UINT val : VALBITS;
       } u;
   }
@@ -1096,7 +1108,7 @@ struct Lisp_Symbol
      1 : it's a varalias, the value is really in the `alias' symbol.
      2 : it's a localized var, the value is in the `blv' object.
      3 : it's a forwarding variable, the value is in `forward'.  */
-  enum symbol_redirect redirect : 3;
+  ENUM_BF (symbol_redirect) redirect : 3;
 
   /* Non-zero means symbol is constant, i.e. changing its value
      should signal an error.  If the value is 3, then the var
@@ -1309,7 +1321,7 @@ struct Lisp_Hash_Table
 
 struct Lisp_Misc_Any            /* Supertype of all Misc types.  */
 {
-  enum Lisp_Misc_Type type : 16;                /* = Lisp_Misc_??? */
+  ENUM_BF (Lisp_Misc_Type) type : 16;           /* = Lisp_Misc_??? */
   unsigned gcmarkbit : 1;
   int spacer : 15;
   /* Make it as long as "Lisp_Free without padding".  */
@@ -1318,7 +1330,7 @@ struct Lisp_Misc_Any		/* Supertype of all Misc types.  */
 
 struct Lisp_Marker
 {
-  enum Lisp_Misc_Type type : 16;                /* = Lisp_Misc_Marker */
+  ENUM_BF (Lisp_Misc_Type) type : 16;           /* = Lisp_Misc_Marker */
   unsigned gcmarkbit : 1;
   int spacer : 13;
   /* This flag is temporarily used in the functions
@@ -1468,7 +1480,7 @@ struct Lisp_Overlay
    I.e. 9words plus 2 bits, 3words of which are for external linked lists.
 */
   {
-    enum Lisp_Misc_Type type : 16;      /* = Lisp_Misc_Overlay */
+    ENUM_BF (Lisp_Misc_Type) type : 16; /* = Lisp_Misc_Overlay */
     unsigned gcmarkbit : 1;
     int spacer : 15;
     struct Lisp_Overlay *next;
@@ -1487,7 +1499,7 @@ struct Lisp_Kboard_Objfwd
    This type of object is used in the arg to record_unwind_protect.  */
 struct Lisp_Save_Value
   {
-    enum Lisp_Misc_Type type : 16;      /* = Lisp_Misc_Save_Value */
+    ENUM_BF (Lisp_Misc_Type) type : 16; /* = Lisp_Misc_Save_Value */
     unsigned gcmarkbit : 1;
     int spacer : 14;
     /* If DOGC is set, POINTER is the address of a memory
@@ -1501,7 +1513,7 @@ struct Lisp_Save_Value
 /* A miscellaneous object, when it's on the free list.  */
 struct Lisp_Free
   {
-    enum Lisp_Misc_Type type : 16;      /* = Lisp_Misc_Free */
+    ENUM_BF (Lisp_Misc_Type) type : 16; /* = Lisp_Misc_Free */
     unsigned gcmarkbit : 1;
     int spacer : 15;
     union Lisp_Misc *chain;
@@ -1896,13 +1908,23 @@ typedef struct {
 
 /* This version of DEFUN declares a function prototype with the right
    arguments, so we can catch errors with maxargs at compile-time.  */
-#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc) \
-  Lisp_Object fnname DEFUN_ARGS_ ## maxargs ;                           \
-  static DECL_ALIGN (struct Lisp_Subr, sname) =                         \
-    { PVEC_SUBR,                                                        \
-      { .a ## maxargs = fnname },                               \
-      minargs, maxargs, lname, intspec, 0};                             \
-  Lisp_Object fnname
+#ifdef _MSC_VER
+#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc)     \
+   Lisp_Object fnname DEFUN_ARGS_ ## maxargs ;                          \
+   static DECL_ALIGN (struct Lisp_Subr, sname) =                        \
+     { PVEC_SUBR | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)),    \
+      { (Lisp_Object (__cdecl *)(void))fnname },                        \
+       minargs, maxargs, lname, intspec, 0};                            \
+   Lisp_Object fnname
+#else  /* not _MSC_VER */
+#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc)     \
+   Lisp_Object fnname DEFUN_ARGS_ ## maxargs ;                          \
+   static DECL_ALIGN (struct Lisp_Subr, sname) =                        \
+     { PVEC_SUBR,                                                       \
+      { .a ## maxargs = fnname },                                       \
+       minargs, maxargs, lname, intspec, 0};                            \
+   Lisp_Object fnname
+#endif
 
 /* Note that the weird token-substitution semantics of ANSI C makes
    this work for MANY and UNEVALLED.  */
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 53cb5f857ab..bee857694e2 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -348,11 +348,11 @@ TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2)
 TAGS-gmake:
         ../lib-src/$(BLD)/etags.exe --include=TAGS-LISP --include=../nt/TAGS \
           --regex=@../nt/emacs-src.tags \
-          $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ0))
+          $(OBJ0_c)
         ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
-          $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1))
+          $(OBJ1_c)
         ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
-          $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ2)) \
+          $(OBJ2_c) \
           $(CURDIR)/*.h $(CURDIR)/m/intel386.h $(CURDIR)/s/ms-w32.h
 
 TAGS-nmake:
diff --git a/src/regex.c b/src/regex.c
index 8033ab9edaa..ccbad58abb3 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -530,7 +530,11 @@ init_syntax_once (void)
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 
 /* Type of source-pattern and string chars.  */
+#ifdef _MSC_VER
+typedef unsigned char re_char;
+#else
 typedef const unsigned char re_char;
+#endif
 
 typedef char boolean;
 #define false 0
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 813c3cef115..519f6e7bc63 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -86,6 +86,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_))
 
 #include <sys/types.h>
+
+#ifdef _MSC_VER
+typedef unsigned long sigset_t;
+typedef int ssize_t;
+#endif
+
 struct sigaction {
   int sa_flags;
   void (*sa_handler)(int);
@@ -181,6 +187,12 @@ struct sigaction {
 
 #ifdef emacs
 
+#ifdef _MSC_VER
+#include <sys/timeb.h>
+#include <sys/stat.h>
+#include <signal.h>
+#endif
+
 /* Calls that are emulated or shadowed.  */
 #undef access
 #define access  sys_access
@@ -270,6 +282,15 @@ typedef int pid_t;
 #define utime     _utime
 #endif
 
+#ifdef _MSC_VER
+/* MSVC gets link-time errors without these redirections.  */
+#define fstat(a, b) sys_fstat(a, b)
+#define stat(a, b)  sys_stat(a, b)
+#if _MSC_VER >= 1400
+#define utime       sys_utime
+#endif
+#endif
+
 /* This is hacky, but is necessary to avoid warnings about macro
    redefinitions using the SDK compilers.  */
 #ifndef __STDC__
@@ -317,13 +338,17 @@ extern char *get_emacs_configuration_options (void);
 #define _WINSOCK_H
 
 /* Defines size_t and alloca ().  */
-#ifdef USE_CRT_DLL
+#if (defined(_MSC_VER) && defined(emacs)) || defined(USE_CRT_DLL)
 #define malloc e_malloc
 #define free   e_free
 #define realloc e_realloc
 #define calloc e_calloc
 #endif
+#ifdef _MSC_VER
+#define alloca _alloca
+#else
 #include <malloc.h>
+#endif
 
 #include <sys/stat.h>
 
diff --git a/src/w32.c b/src/w32.c
index 42546fc8d49..f17e987f437 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -94,7 +94,9 @@ typedef struct _MEMORY_STATUS_EX {
 
 #include <tlhelp32.h>
 #include <psapi.h>
+#ifndef _MSC_VER
 #include <w32api.h>
+#endif
 #if !defined (__MINGW32__) || __W32API_MAJOR_VERSION < 3 || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 15)
 /* This either is not in psapi.h or guarded by higher value of
    _WIN32_WINNT than what we use.  w32api supplied with MinGW 3.15
@@ -1547,7 +1549,12 @@ init_environment (char ** argv)
          read-only filesystem, like CD-ROM or a write-protected floppy.
          The only way to be really sure is to actually create a file and
          see if it succeeds.  But I think that's too much to ask.  */
+#ifdef _MSC_VER
+      /* MSVC's _access crashes with D_OK.  */
+      if (tmp && sys_access (tmp, D_OK) == 0)
+#else
       if (tmp && _access (tmp, D_OK) == 0)
+#endif
         {
           char * var = alloca (strlen (tmp) + 8);
           sprintf (var, "TMPDIR=%s", tmp);
diff --git a/src/w32fns.c b/src/w32fns.c
index f7ba1c59e7b..6380a87098a 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -140,8 +140,8 @@ struct MONITOR_INFO
     DWORD   dwFlags;
 };
 
-/* Reportedly, VS 6 does not have this in its headers.  */
-#if defined (_MSC_VER) && _MSC_VER < 1300
+/* Reportedly, MSVC does not have this in its headers.  */
+#ifdef _MSC_VER
 DECLARE_HANDLE(HMONITOR);
 #endif