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

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
comparison
equal deleted inserted replaced
5928:2f34b59f451a 5929:f5dfcf2323bc
61 61
62 #define HAVE_LONG_FILE_NAMES 62 #define HAVE_LONG_FILE_NAMES
63 63
64 #define HAVE_TIMEVAL 64 #define HAVE_TIMEVAL
65 #define HAVE_TZNAME 65 #define HAVE_TZNAME
66 /* need this, where should it go? HST */
67 #define tzname _tzname
66 #define HAVE_H_ERRNO 68 #define HAVE_H_ERRNO
67 69
68 #define HAVE_CLOSEDIR 70 #define HAVE_CLOSEDIR
69 #define HAVE_DUP2 71 #define HAVE_DUP2
70 #define HAVE_EXECVPE 72 #define HAVE_EXECVPE
97 #define HAVE_DRAGNDROP 99 #define HAVE_DRAGNDROP
98 100
99 #define SIZEOF_SHORT 2 101 #define SIZEOF_SHORT 2
100 #define SIZEOF_INT 4 102 #define SIZEOF_INT 4
101 #define SIZEOF_LONG 4 103 #define SIZEOF_LONG 4
104 #ifdef _WIN64
105 #define SIZEOF_LONG_LONG 8
106 #define SIZEOF_VOID_P 8
107 #define SIZEOF_DOUBLE 8
108 #define SIZEOF_OFF_T 8
109 #else
102 #define SIZEOF_LONG_LONG 0 110 #define SIZEOF_LONG_LONG 0
103 #define SIZEOF_VOID_P 4 111 #define SIZEOF_VOID_P 4
112 #endif
104 113
105 typedef int mode_t; 114 typedef int mode_t;
106 typedef int pid_t; 115 typedef int pid_t;
107 typedef int uid_t; 116 typedef int uid_t;
108 typedef int gid_t; 117 typedef int gid_t;
174 Lisp primitives have to be declared with Lisp_Object return type or 183 Lisp primitives have to be declared with Lisp_Object return type or
175 lots of things get very messed up */ 184 lots of things get very messed up */
176 #pragma warning ( disable : 4646 ) 185 #pragma warning ( disable : 4646 )
177 #endif 186 #endif
178 187
179 /* MSVC version >= 2.x without /Za supports __inline */ 188 /* MSVC version >= 2.x without /Za supports __inline
189 HST cut this -- VS2015 complains
180 #if (_MSC_VER < 900) || defined (__STDC__) 190 #if (_MSC_VER < 900) || defined (__STDC__)
181 # define inline 191 # define inline
182 #else 192 #else
183 # define inline __inline 193 # define inline __inline
184 #endif 194 #endif
195 */