File tree 6 files changed +22
-5
lines changed
jemalloc-win/include/msvc_compat
6 files changed +22
-5
lines changed Original file line number Diff line number Diff line change @@ -103,11 +103,20 @@ typedef uint64_t uint_least64_t;
103
103
104
104
// 7.18.1.3 Fastest minimum-width integer types
105
105
typedef int8_t int_fast8_t ;
106
- typedef int16_t int_fast16_t ;
106
+ #if (_MSC_VER <= 1800 )
107
+ typedef int16_t int_fast16_t ;
108
+ #else
109
+ typedef int int_fast16_t ;
110
+ #endif
111
+
107
112
typedef int32_t int_fast32_t ;
108
113
typedef int64_t int_fast64_t ;
109
114
typedef uint8_t uint_fast8_t ;
110
- typedef uint16_t uint_fast16_t ;
115
+ #if (_MSC_VER <= 1800 )
116
+ typedef uint16_t uint_fast16_t ;
117
+ #else
118
+ typedef unsigned int uint_fast16_t ;
119
+ #endif
111
120
typedef uint32_t uint_fast32_t ;
112
121
typedef uint64_t uint_fast64_t ;
113
122
Original file line number Diff line number Diff line change 37
37
38
38
#ifdef _WIN32
39
39
#define inline __inline
40
- #define snprintf _snprintf
40
+ #if (_MSC_VER <= 1800 )
41
+ #define snprintf _snprintf
42
+ #endif
41
43
#endif
42
44
43
45
/* Lua CJSON assumes the locale is the same for all threads within a
Original file line number Diff line number Diff line change @@ -750,7 +750,9 @@ union luai_Cast { double l_d; long l_l; };
750
750
751
751
752
752
#ifdef _WIN32
753
- #define snprintf _snprintf
753
+ #if (_MSC_VER <= 1800 )
754
+ #define snprintf _snprintf
755
+ #endif
754
756
#endif
755
757
756
758
Original file line number Diff line number Diff line change @@ -37,6 +37,7 @@ typedef unsigned long nfds_t;
37
37
#include <WinSock2.h>
38
38
#include <fcntl.h>
39
39
#include <stdio.h>
40
+ #include <sys/stat.h>
40
41
41
42
// Including a version of this file modified to eliminate prototype
42
43
// definitions not removed by INCL_WINSOCK_API_PROTOTYPES
Original file line number Diff line number Diff line change 25
25
#ifndef WIN32_INTEROP_TIME_H
26
26
#define WIN32_INTEROP_TIME_H
27
27
28
+ #if (_MSC_VER > 1800 )
29
+ #include <corecrt.h>
30
+ #endif
28
31
#include <stdint.h>
29
32
30
33
#define gettimeofday gettimeofday_highres
Original file line number Diff line number Diff line change @@ -1087,7 +1087,7 @@ void freeClientsInAsyncFreeQueue(void);
1087
1087
void asyncCloseClientOnOutputBufferLimitReached (redisClient * c );
1088
1088
int getClientType (redisClient * c );
1089
1089
int getClientTypeByName (char * name );
1090
- char * getClientTypeName (int class );
1090
+ char * getClientTypeName (int IF_WIN32 ( _class , class ) );
1091
1091
void flushSlavesOutputBuffers (void );
1092
1092
void disconnectSlaves (void );
1093
1093
int listenToPort (int port , int * fds , int * count );
You can’t perform that action at this time.
0 commit comments