diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/autoinit_funcs.h | 4 | ||||
-rw-r--r-- | src/include/microhttpd.h | 10 | ||||
-rw-r--r-- | src/include/microhttpd2.h | 10 | ||||
-rw-r--r-- | src/include/platform.h | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/include/autoinit_funcs.h b/src/include/autoinit_funcs.h index 7d03679c..adf66460 100644 --- a/src/include/autoinit_funcs.h +++ b/src/include/autoinit_funcs.h | |||
@@ -67,7 +67,7 @@ | |||
67 | * Current version of the header in packed BCD form. | 67 | * Current version of the header in packed BCD form. |
68 | * 0x01093001 = 1.9.30-1. | 68 | * 0x01093001 = 1.9.30-1. |
69 | */ | 69 | */ |
70 | #define AUTOINIT_FUNCS_VERSION 0x01000300 | 70 | #define AUTOINIT_FUNCS_VERSION 0x01000400 |
71 | 71 | ||
72 | #if defined(__GNUC__) || defined(__clang__) | 72 | #if defined(__GNUC__) || defined(__clang__) |
73 | /* if possible - check for supported attribute */ | 73 | /* if possible - check for supported attribute */ |
@@ -96,7 +96,7 @@ | |||
96 | #define _SET_INIT_AND_DEINIT_FUNCS(FI,FD) GNUC_SET_INIT_AND_DEINIT (FI,FD) | 96 | #define _SET_INIT_AND_DEINIT_FUNCS(FI,FD) GNUC_SET_INIT_AND_DEINIT (FI,FD) |
97 | #define _AUTOINIT_FUNCS_ARE_SUPPORTED 1 | 97 | #define _AUTOINIT_FUNCS_ARE_SUPPORTED 1 |
98 | 98 | ||
99 | #elif defined (_MSC_FULL_VER) && _MSC_VER + 0 >= 1600 | 99 | #elif defined(_MSC_FULL_VER) && _MSC_VER + 0 >= 1600 |
100 | 100 | ||
101 | /* Make sure that your project/sources define: | 101 | /* Make sure that your project/sources define: |
102 | _LIB if building a static library (_LIB is ignored if _CONSOLE is defined); | 102 | _LIB if building a static library (_LIB is ignored if _CONSOLE is defined); |
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index 309929ca..f91c1cd0 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -121,7 +121,7 @@ extern "C" | |||
121 | #include <sys/socket.h> | 121 | #include <sys/socket.h> |
122 | #else /* _WIN32 && ! __CYGWIN__ */ | 122 | #else /* _WIN32 && ! __CYGWIN__ */ |
123 | #include <ws2tcpip.h> | 123 | #include <ws2tcpip.h> |
124 | #if defined(_MSC_FULL_VER) && ! defined (_SSIZE_T_DEFINED) | 124 | #if defined(_MSC_FULL_VER) && ! defined(_SSIZE_T_DEFINED) |
125 | #define _SSIZE_T_DEFINED | 125 | #define _SSIZE_T_DEFINED |
126 | typedef intptr_t ssize_t; | 126 | typedef intptr_t ssize_t; |
127 | #endif /* !_SSIZE_T_DEFINED */ | 127 | #endif /* !_SSIZE_T_DEFINED */ |
@@ -190,7 +190,7 @@ enum MHD_Result | |||
190 | #ifndef _MHD_EXTERN | 190 | #ifndef _MHD_EXTERN |
191 | #if defined(_WIN32) && defined(MHD_W32LIB) | 191 | #if defined(_WIN32) && defined(MHD_W32LIB) |
192 | #define _MHD_EXTERN extern | 192 | #define _MHD_EXTERN extern |
193 | #elif defined (_WIN32) && defined(MHD_W32DLL) | 193 | #elif defined(_WIN32) && defined(MHD_W32DLL) |
194 | /* Define MHD_W32DLL when using MHD as W32 .DLL to speed up linker a little */ | 194 | /* Define MHD_W32DLL when using MHD as W32 .DLL to speed up linker a little */ |
195 | #define _MHD_EXTERN __declspec(dllimport) | 195 | #define _MHD_EXTERN __declspec(dllimport) |
196 | #else | 196 | #else |
@@ -236,7 +236,7 @@ typedef SOCKET MHD_socket; | |||
236 | #define _MHD_DEPR_MACRO(msg) \ | 236 | #define _MHD_DEPR_MACRO(msg) \ |
237 | __pragma(message (__FILE__ "(" _MHD_STRMACRO ( __LINE__) "): warning: " msg)) | 237 | __pragma(message (__FILE__ "(" _MHD_STRMACRO ( __LINE__) "): warning: " msg)) |
238 | #define _MHD_DEPR_IN_MACRO(msg) _MHD_DEPR_MACRO (msg) | 238 | #define _MHD_DEPR_IN_MACRO(msg) _MHD_DEPR_MACRO (msg) |
239 | #elif defined(__clang__) || defined (__GNUC_PATCHLEVEL__) | 239 | #elif defined(__clang__) || defined(__GNUC_PATCHLEVEL__) |
240 | /* clang or GCC since 3.0 */ | 240 | /* clang or GCC since 3.0 */ |
241 | #define _MHD_GCC_PRAG(x) _Pragma(#x) | 241 | #define _MHD_GCC_PRAG(x) _Pragma(#x) |
242 | #if (defined(__clang__) && \ | 242 | #if (defined(__clang__) && \ |
@@ -279,12 +279,12 @@ typedef SOCKET MHD_socket; | |||
279 | #elif defined(_MSC_FULL_VER) && _MSC_VER + 0 >= 1310 | 279 | #elif defined(_MSC_FULL_VER) && _MSC_VER + 0 >= 1310 |
280 | /* VS .NET 2003 deprecation does not support custom messages */ | 280 | /* VS .NET 2003 deprecation does not support custom messages */ |
281 | #define _MHD_DEPR_FUNC(msg) __declspec(deprecated) | 281 | #define _MHD_DEPR_FUNC(msg) __declspec(deprecated) |
282 | #elif (__GNUC__ + 0 >= 5) || (defined (__clang__) && \ | 282 | #elif (__GNUC__ + 0 >= 5) || (defined(__clang__) && \ |
283 | (__clang_major__ + 0 > 2 || \ | 283 | (__clang_major__ + 0 > 2 || \ |
284 | (__clang_major__ + 0 == 2 && __clang_minor__ >= 9))) | 284 | (__clang_major__ + 0 == 2 && __clang_minor__ >= 9))) |
285 | /* GCC >= 5.0 or clang >= 2.9 */ | 285 | /* GCC >= 5.0 or clang >= 2.9 */ |
286 | #define _MHD_DEPR_FUNC(msg) __attribute__((deprecated (msg))) | 286 | #define _MHD_DEPR_FUNC(msg) __attribute__((deprecated (msg))) |
287 | #elif defined (__clang__) || __GNUC__ + 0 > 3 || \ | 287 | #elif defined(__clang__) || __GNUC__ + 0 > 3 || \ |
288 | (__GNUC__ + 0 == 3 && __GNUC_MINOR__ + 0 >= 1) | 288 | (__GNUC__ + 0 == 3 && __GNUC_MINOR__ + 0 >= 1) |
289 | /* 3.1 <= GCC < 5.0 or clang < 2.9 */ | 289 | /* 3.1 <= GCC < 5.0 or clang < 2.9 */ |
290 | /* old GCC-style deprecation does not support custom messages */ | 290 | /* old GCC-style deprecation does not support custom messages */ |
diff --git a/src/include/microhttpd2.h b/src/include/microhttpd2.h index 5bf125ef..5a878533 100644 --- a/src/include/microhttpd2.h +++ b/src/include/microhttpd2.h | |||
@@ -101,7 +101,7 @@ extern "C" | |||
101 | #include <sys/types.h> | 101 | #include <sys/types.h> |
102 | #if defined(_WIN32) && ! defined(__CYGWIN__) | 102 | #if defined(_WIN32) && ! defined(__CYGWIN__) |
103 | #include <ws2tcpip.h> | 103 | #include <ws2tcpip.h> |
104 | #if defined(_MSC_FULL_VER) && ! defined (_SSIZE_T_DEFINED) | 104 | #if defined(_MSC_FULL_VER) && ! defined(_SSIZE_T_DEFINED) |
105 | #define _SSIZE_T_DEFINED | 105 | #define _SSIZE_T_DEFINED |
106 | typedef intptr_t ssize_t; | 106 | typedef intptr_t ssize_t; |
107 | #endif /* !_SSIZE_T_DEFINED */ | 107 | #endif /* !_SSIZE_T_DEFINED */ |
@@ -166,7 +166,7 @@ enum MHD_Bool | |||
166 | #ifndef _MHD_EXTERN | 166 | #ifndef _MHD_EXTERN |
167 | #if defined(_WIN32) && defined(MHD_W32LIB) | 167 | #if defined(_WIN32) && defined(MHD_W32LIB) |
168 | #define _MHD_EXTERN extern | 168 | #define _MHD_EXTERN extern |
169 | #elif defined (_WIN32) && defined(MHD_W32DLL) | 169 | #elif defined(_WIN32) && defined(MHD_W32DLL) |
170 | /* Define MHD_W32DLL when using MHD as W32 .DLL to speed up linker a little */ | 170 | /* Define MHD_W32DLL when using MHD as W32 .DLL to speed up linker a little */ |
171 | #define _MHD_EXTERN __declspec(dllimport) | 171 | #define _MHD_EXTERN __declspec(dllimport) |
172 | #else | 172 | #else |
@@ -212,7 +212,7 @@ typedef SOCKET MHD_socket; | |||
212 | #define _MHD_DEPR_MACRO(msg) __pragma(message (__FILE__ "(" _MHD_STRMACRO ( \ | 212 | #define _MHD_DEPR_MACRO(msg) __pragma(message (__FILE__ "(" _MHD_STRMACRO ( \ |
213 | __LINE__) "): warning: " msg)) | 213 | __LINE__) "): warning: " msg)) |
214 | #define _MHD_DEPR_IN_MACRO(msg) _MHD_DEPR_MACRO (msg) | 214 | #define _MHD_DEPR_IN_MACRO(msg) _MHD_DEPR_MACRO (msg) |
215 | #elif defined(__clang__) || defined (__GNUC_PATCHLEVEL__) | 215 | #elif defined(__clang__) || defined(__GNUC_PATCHLEVEL__) |
216 | /* clang or GCC since 3.0 */ | 216 | /* clang or GCC since 3.0 */ |
217 | #define _MHD_GCC_PRAG(x) _Pragma(#x) | 217 | #define _MHD_GCC_PRAG(x) _Pragma(#x) |
218 | #if (defined(__clang__) && (__clang_major__ + 0 >= 5 || \ | 218 | #if (defined(__clang__) && (__clang_major__ + 0 >= 5 || \ |
@@ -254,12 +254,12 @@ typedef SOCKET MHD_socket; | |||
254 | #elif defined(_MSC_FULL_VER) && _MSC_VER + 0 >= 1310 | 254 | #elif defined(_MSC_FULL_VER) && _MSC_VER + 0 >= 1310 |
255 | /* VS .NET 2003 deprecation do not support custom messages */ | 255 | /* VS .NET 2003 deprecation do not support custom messages */ |
256 | #define _MHD_DEPR_FUNC(msg) __declspec(deprecated) | 256 | #define _MHD_DEPR_FUNC(msg) __declspec(deprecated) |
257 | #elif (__GNUC__ + 0 >= 5) || (defined (__clang__) && \ | 257 | #elif (__GNUC__ + 0 >= 5) || (defined(__clang__) && \ |
258 | (__clang_major__ + 0 > 2 || (__clang_major__ + 0 == 2 && __clang_minor__ >= \ | 258 | (__clang_major__ + 0 > 2 || (__clang_major__ + 0 == 2 && __clang_minor__ >= \ |
259 | 9))) /* FIXME: earlier versions not tested */ | 259 | 9))) /* FIXME: earlier versions not tested */ |
260 | /* GCC >= 5.0 or clang >= 2.9 */ | 260 | /* GCC >= 5.0 or clang >= 2.9 */ |
261 | #define _MHD_DEPR_FUNC(msg) __attribute__((deprecated (msg))) | 261 | #define _MHD_DEPR_FUNC(msg) __attribute__((deprecated (msg))) |
262 | #elif defined (__clang__) || __GNUC__ + 0 > 3 || (__GNUC__ + 0 == 3 && \ | 262 | #elif defined(__clang__) || __GNUC__ + 0 > 3 || (__GNUC__ + 0 == 3 && \ |
263 | __GNUC_MINOR__ + 0 >= 1) | 263 | __GNUC_MINOR__ + 0 >= 1) |
264 | /* 3.1 <= GCC < 5.0 or clang < 2.9 */ | 264 | /* 3.1 <= GCC < 5.0 or clang < 2.9 */ |
265 | /* old GCC-style deprecation do not support custom messages */ | 265 | /* old GCC-style deprecation do not support custom messages */ |
diff --git a/src/include/platform.h b/src/include/platform.h index 4376636e..1db1e4eb 100644 --- a/src/include/platform.h +++ b/src/include/platform.h | |||
@@ -117,7 +117,7 @@ | |||
117 | #define usleep(useconds) ((SleepEx ((useconds) / 1000, 1)==0) ? 0 : -1) | 117 | #define usleep(useconds) ((SleepEx ((useconds) / 1000, 1)==0) ? 0 : -1) |
118 | #endif | 118 | #endif |
119 | 119 | ||
120 | #if defined(_MSC_FULL_VER) && ! defined (_SSIZE_T_DEFINED) | 120 | #if defined(_MSC_FULL_VER) && ! defined(_SSIZE_T_DEFINED) |
121 | #define _SSIZE_T_DEFINED | 121 | #define _SSIZE_T_DEFINED |
122 | typedef intptr_t ssize_t; | 122 | typedef intptr_t ssize_t; |
123 | #endif /* !_SSIZE_T_DEFINED */ | 123 | #endif /* !_SSIZE_T_DEFINED */ |