diff options
Diffstat (limited to 'src/include/microhttpd2.h')
-rw-r--r-- | src/include/microhttpd2.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/include/microhttpd2.h b/src/include/microhttpd2.h index 52e423a2..924814f9 100644 --- a/src/include/microhttpd2.h +++ b/src/include/microhttpd2.h | |||
@@ -209,12 +209,12 @@ typedef SOCKET MHD_socket; | |||
209 | #define _MHD_INSTRMACRO(a) #a | 209 | #define _MHD_INSTRMACRO(a) #a |
210 | #define _MHD_STRMACRO(a) _MHD_INSTRMACRO (a) | 210 | #define _MHD_STRMACRO(a) _MHD_INSTRMACRO (a) |
211 | /* deprecation message */ | 211 | /* deprecation message */ |
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 || \ |
219 | (! defined(__apple_build_version__) && \ | 219 | (! defined(__apple_build_version__) && \ |
220 | (__clang_major__ + 0 > 3 || (__clang_major__ + 0 == 3 && __clang_minor__ >= \ | 220 | (__clang_major__ + 0 > 3 || (__clang_major__ + 0 == 3 && __clang_minor__ >= \ |
@@ -280,7 +280,8 @@ typedef SOCKET MHD_socket; | |||
280 | * Macro to indicate that certain parameters must be | 280 | * Macro to indicate that certain parameters must be |
281 | * non-null. Todo: port to non-gcc platforms. | 281 | * non-null. Todo: port to non-gcc platforms. |
282 | */ | 282 | */ |
283 | #if defined(__CYGWIN__) || defined(_WIN32) || defined(MHD_W32LIB) | 283 | #if defined(__CYGWIN__) || defined(_WIN32) || defined(MHD_W32LIB) || \ |
284 | defined(__clang__) || ! defined(__GNUC__) | ||
284 | #define MHD_NONNULL(...) /* empty */ | 285 | #define MHD_NONNULL(...) /* empty */ |
285 | #else | 286 | #else |
286 | #define MHD_NONNULL(...) __THROW __nonnull ((__VA_ARGS__)) | 287 | #define MHD_NONNULL(...) __THROW __nonnull ((__VA_ARGS__)) |