Mercurial > hg > xemacs-beta

diff src/s/windowsnt.h @ 5929:f5dfcf2323bc cygwin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vs2015_3.patch applied, and some vs64 fixes
author Henry Thompson <ht@markup.co.uk>
date Tue, 08 Dec 2015 09:05:19 +0000
parents 308d34e9f07d
children a0d9bfe304de
line wrap: on
line diff
--- a/src/s/windowsnt.h	Fri Jul 24 14:48:46 2015 +0100
+++ b/src/s/windowsnt.h	Tue Dec 08 09:05:19 2015 +0000
@@ -63,6 +63,8 @@
 
 #define HAVE_TIMEVAL
 #define HAVE_TZNAME
+/* need this, where should it go? HST */
+#define tzname _tzname
 #define HAVE_H_ERRNO
 
 #define HAVE_CLOSEDIR
@@ -99,8 +101,15 @@
 #define SIZEOF_SHORT 2
 #define SIZEOF_INT 4
 #define SIZEOF_LONG 4
+#ifdef _WIN64
+#define SIZEOF_LONG_LONG 8
+#define SIZEOF_VOID_P 8
+#define SIZEOF_DOUBLE 8
+#define SIZEOF_OFF_T 8
+#else
 #define SIZEOF_LONG_LONG 0
 #define SIZEOF_VOID_P 4
+#endif
 
 typedef int mode_t;
 typedef int pid_t;
@@ -176,9 +185,11 @@
 #pragma warning ( disable : 4646 )
 #endif 
 
-/* MSVC version >= 2.x without /Za supports __inline */
+/* MSVC version >= 2.x without /Za supports __inline
+   HST cut this -- VS2015 complains
 #if (_MSC_VER < 900) || defined (__STDC__)
 # define inline
 #else
 # define inline __inline
 #endif
+ */