aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2021-08-18 12:09:59 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2021-08-18 12:50:23 +0300
commitbe6faace006bef08d2bd24d17471090daaee40fd (patch)
tree8eda2a0a308190c6949836d76094a18522ca2cda
parent0c3806b05804d668f3a88853f90e930bc180b10e (diff)
downloadlibmicrohttpd-be6faace006bef08d2bd24d17471090daaee40fd.tar.gz
libmicrohttpd-be6faace006bef08d2bd24d17471090daaee40fd.zip
microhttpd.h: minor macro formatting
-rw-r--r--src/include/microhttpd.h25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 5ae7d8cf..4edd2d0b 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -131,7 +131,7 @@ typedef intptr_t ssize_t;
131 * they are parsed as decimal numbers. 131 * they are parsed as decimal numbers.
132 * Example: 0x01093001 = 1.9.30-1. 132 * Example: 0x01093001 = 1.9.30-1.
133 */ 133 */
134#define MHD_VERSION 0x00097304 134#define MHD_VERSION 0x00097305
135 135
136 136
137#ifdef __has_attribute 137#ifdef __has_attribute
@@ -245,10 +245,11 @@ typedef SOCKET MHD_socket;
245#elif defined(__clang__) || defined (__GNUC_PATCHLEVEL__) 245#elif defined(__clang__) || defined (__GNUC_PATCHLEVEL__)
246/* clang or GCC since 3.0 */ 246/* clang or GCC since 3.0 */
247#define _MHD_GCC_PRAG(x) _Pragma(#x) 247#define _MHD_GCC_PRAG(x) _Pragma(#x)
248#if (defined(__clang__) && (__clang_major__ + 0 >= 5 || \ 248#if (defined(__clang__) && \
249 (! defined(__apple_build_version__) && \ 249 (__clang_major__ + 0 >= 5 || \
250 (__clang_major__ + 0 > 3 || (__clang_major__ + 0 == 3 && __clang_minor__ >= \ 250 (! defined(__apple_build_version__) && \
251 3))))) || \ 251 (__clang_major__ + 0 > 3 || \
252 (__clang_major__ + 0 == 3 && __clang_minor__ >= 3))))) || \
252 __GNUC__ + 0 > 4 || (__GNUC__ + 0 == 4 && __GNUC_MINOR__ + 0 >= 8) 253 __GNUC__ + 0 > 4 || (__GNUC__ + 0 == 4 && __GNUC_MINOR__ + 0 >= 8)
253/* clang >= 3.3 (or XCode's clang >= 5.0) or 254/* clang >= 3.3 (or XCode's clang >= 5.0) or
254 GCC >= 4.8 */ 255 GCC >= 4.8 */
@@ -257,9 +258,9 @@ typedef SOCKET MHD_socket;
257#else /* older clang or GCC */ 258#else /* older clang or GCC */
258/* clang < 3.3, XCode's clang < 5.0, 3.0 <= GCC < 4.8 */ 259/* clang < 3.3, XCode's clang < 5.0, 3.0 <= GCC < 4.8 */
259#define _MHD_DEPR_MACRO(msg) _MHD_GCC_PRAG (message msg) 260#define _MHD_DEPR_MACRO(msg) _MHD_GCC_PRAG (message msg)
260#if (defined(__clang__) && (__clang_major__ + 0 > 2 || (__clang_major__ + 0 == \ 261#if (defined(__clang__) && \
261 2 && __clang_minor__ >= \ 262 (__clang_major__ + 0 > 2 || \
262 9))) /* FIXME: clang >= 2.9, earlier versions not tested */ 263 (__clang_major__ + 0 == 2 && __clang_minor__ >= 9))) /* clang >= 2.9 */
263/* clang handles inline pragmas better than GCC */ 264/* clang handles inline pragmas better than GCC */
264#define _MHD_DEPR_IN_MACRO(msg) _MHD_DEPR_MACRO (msg) 265#define _MHD_DEPR_IN_MACRO(msg) _MHD_DEPR_MACRO (msg)
265#endif /* clang >= 2.9 */ 266#endif /* clang >= 2.9 */
@@ -285,12 +286,12 @@ typedef SOCKET MHD_socket;
285/* VS .NET 2003 deprecation do not support custom messages */ 286/* VS .NET 2003 deprecation do not support custom messages */
286#define _MHD_DEPR_FUNC(msg) __declspec(deprecated) 287#define _MHD_DEPR_FUNC(msg) __declspec(deprecated)
287#elif (__GNUC__ + 0 >= 5) || (defined (__clang__) && \ 288#elif (__GNUC__ + 0 >= 5) || (defined (__clang__) && \
288 (__clang_major__ + 0 > 2 || (__clang_major__ + 0 == 2 && __clang_minor__ >= \ 289 (__clang_major__ + 0 > 2 || \
289 9))) /* FIXME: earlier versions not tested */ 290 (__clang_major__ + 0 == 2 && __clang_minor__ >= 9)))
290/* GCC >= 5.0 or clang >= 2.9 */ 291/* GCC >= 5.0 or clang >= 2.9 */
291#define _MHD_DEPR_FUNC(msg) __attribute__((deprecated (msg))) 292#define _MHD_DEPR_FUNC(msg) __attribute__((deprecated (msg)))
292#elif defined (__clang__) || __GNUC__ + 0 > 3 || (__GNUC__ + 0 == 3 && \ 293#elif defined (__clang__) || __GNUC__ + 0 > 3 || \
293 __GNUC_MINOR__ + 0 >= 1) 294 (__GNUC__ + 0 == 3 && __GNUC_MINOR__ + 0 >= 1)
294/* 3.1 <= GCC < 5.0 or clang < 2.9 */ 295/* 3.1 <= GCC < 5.0 or clang < 2.9 */
295/* old GCC-style deprecation do not support custom messages */ 296/* old GCC-style deprecation do not support custom messages */
296#define _MHD_DEPR_FUNC(msg) __attribute__((__deprecated__)) 297#define _MHD_DEPR_FUNC(msg) __attribute__((__deprecated__))