commit 8c87442ffc677fd41c31c9a3fde0d685ef5ae65d
parent 6f4d2a44169eb4197febcf754cc5e6ae4a10a6b7
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date: Sat, 23 Apr 2022 15:20:27 +0300
Fixed many macros
'defined()' should be used without space before bracket
Diffstat:
17 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/src/include/autoinit_funcs.h b/src/include/autoinit_funcs.h
@@ -67,7 +67,7 @@
* Current version of the header in packed BCD form.
* 0x01093001 = 1.9.30-1.
*/
-#define AUTOINIT_FUNCS_VERSION 0x01000300
+#define AUTOINIT_FUNCS_VERSION 0x01000400
#if defined(__GNUC__) || defined(__clang__)
/* if possible - check for supported attribute */
@@ -96,7 +96,7 @@
#define _SET_INIT_AND_DEINIT_FUNCS(FI,FD) GNUC_SET_INIT_AND_DEINIT (FI,FD)
#define _AUTOINIT_FUNCS_ARE_SUPPORTED 1
-#elif defined (_MSC_FULL_VER) && _MSC_VER + 0 >= 1600
+#elif defined(_MSC_FULL_VER) && _MSC_VER + 0 >= 1600
/* Make sure that your project/sources define:
_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
@@ -121,7 +121,7 @@ extern "C"
#include <sys/socket.h>
#else /* _WIN32 && ! __CYGWIN__ */
#include <ws2tcpip.h>
-#if defined(_MSC_FULL_VER) && ! defined (_SSIZE_T_DEFINED)
+#if defined(_MSC_FULL_VER) && ! defined(_SSIZE_T_DEFINED)
#define _SSIZE_T_DEFINED
typedef intptr_t ssize_t;
#endif /* !_SSIZE_T_DEFINED */
@@ -190,7 +190,7 @@ enum MHD_Result
#ifndef _MHD_EXTERN
#if defined(_WIN32) && defined(MHD_W32LIB)
#define _MHD_EXTERN extern
-#elif defined (_WIN32) && defined(MHD_W32DLL)
+#elif defined(_WIN32) && defined(MHD_W32DLL)
/* Define MHD_W32DLL when using MHD as W32 .DLL to speed up linker a little */
#define _MHD_EXTERN __declspec(dllimport)
#else
@@ -236,7 +236,7 @@ typedef SOCKET MHD_socket;
#define _MHD_DEPR_MACRO(msg) \
__pragma(message (__FILE__ "(" _MHD_STRMACRO ( __LINE__) "): warning: " msg))
#define _MHD_DEPR_IN_MACRO(msg) _MHD_DEPR_MACRO (msg)
-#elif defined(__clang__) || defined (__GNUC_PATCHLEVEL__)
+#elif defined(__clang__) || defined(__GNUC_PATCHLEVEL__)
/* clang or GCC since 3.0 */
#define _MHD_GCC_PRAG(x) _Pragma(#x)
#if (defined(__clang__) && \
@@ -279,12 +279,12 @@ typedef SOCKET MHD_socket;
#elif defined(_MSC_FULL_VER) && _MSC_VER + 0 >= 1310
/* VS .NET 2003 deprecation does not support custom messages */
#define _MHD_DEPR_FUNC(msg) __declspec(deprecated)
-#elif (__GNUC__ + 0 >= 5) || (defined (__clang__) && \
+#elif (__GNUC__ + 0 >= 5) || (defined(__clang__) && \
(__clang_major__ + 0 > 2 || \
(__clang_major__ + 0 == 2 && __clang_minor__ >= 9)))
/* GCC >= 5.0 or clang >= 2.9 */
#define _MHD_DEPR_FUNC(msg) __attribute__((deprecated (msg)))
-#elif defined (__clang__) || __GNUC__ + 0 > 3 || \
+#elif defined(__clang__) || __GNUC__ + 0 > 3 || \
(__GNUC__ + 0 == 3 && __GNUC_MINOR__ + 0 >= 1)
/* 3.1 <= GCC < 5.0 or clang < 2.9 */
/* old GCC-style deprecation does not support custom messages */
diff --git a/src/include/microhttpd2.h b/src/include/microhttpd2.h
@@ -101,7 +101,7 @@ extern "C"
#include <sys/types.h>
#if defined(_WIN32) && ! defined(__CYGWIN__)
#include <ws2tcpip.h>
-#if defined(_MSC_FULL_VER) && ! defined (_SSIZE_T_DEFINED)
+#if defined(_MSC_FULL_VER) && ! defined(_SSIZE_T_DEFINED)
#define _SSIZE_T_DEFINED
typedef intptr_t ssize_t;
#endif /* !_SSIZE_T_DEFINED */
@@ -166,7 +166,7 @@ enum MHD_Bool
#ifndef _MHD_EXTERN
#if defined(_WIN32) && defined(MHD_W32LIB)
#define _MHD_EXTERN extern
-#elif defined (_WIN32) && defined(MHD_W32DLL)
+#elif defined(_WIN32) && defined(MHD_W32DLL)
/* Define MHD_W32DLL when using MHD as W32 .DLL to speed up linker a little */
#define _MHD_EXTERN __declspec(dllimport)
#else
@@ -212,7 +212,7 @@ typedef SOCKET MHD_socket;
#define _MHD_DEPR_MACRO(msg) __pragma(message (__FILE__ "(" _MHD_STRMACRO ( \
__LINE__) "): warning: " msg))
#define _MHD_DEPR_IN_MACRO(msg) _MHD_DEPR_MACRO (msg)
-#elif defined(__clang__) || defined (__GNUC_PATCHLEVEL__)
+#elif defined(__clang__) || defined(__GNUC_PATCHLEVEL__)
/* clang or GCC since 3.0 */
#define _MHD_GCC_PRAG(x) _Pragma(#x)
#if (defined(__clang__) && (__clang_major__ + 0 >= 5 || \
@@ -254,12 +254,12 @@ typedef SOCKET MHD_socket;
#elif defined(_MSC_FULL_VER) && _MSC_VER + 0 >= 1310
/* VS .NET 2003 deprecation do not support custom messages */
#define _MHD_DEPR_FUNC(msg) __declspec(deprecated)
-#elif (__GNUC__ + 0 >= 5) || (defined (__clang__) && \
+#elif (__GNUC__ + 0 >= 5) || (defined(__clang__) && \
(__clang_major__ + 0 > 2 || (__clang_major__ + 0 == 2 && __clang_minor__ >= \
9))) /* FIXME: earlier versions not tested */
/* GCC >= 5.0 or clang >= 2.9 */
#define _MHD_DEPR_FUNC(msg) __attribute__((deprecated (msg)))
-#elif defined (__clang__) || __GNUC__ + 0 > 3 || (__GNUC__ + 0 == 3 && \
+#elif defined(__clang__) || __GNUC__ + 0 > 3 || (__GNUC__ + 0 == 3 && \
__GNUC_MINOR__ + 0 >= 1)
/* 3.1 <= GCC < 5.0 or clang < 2.9 */
/* old GCC-style deprecation do not support custom messages */
diff --git a/src/include/platform.h b/src/include/platform.h
@@ -117,7 +117,7 @@
#define usleep(useconds) ((SleepEx ((useconds) / 1000, 1)==0) ? 0 : -1)
#endif
-#if defined(_MSC_FULL_VER) && ! defined (_SSIZE_T_DEFINED)
+#if defined(_MSC_FULL_VER) && ! defined(_SSIZE_T_DEFINED)
#define _SSIZE_T_DEFINED
typedef intptr_t ssize_t;
#endif /* !_SSIZE_T_DEFINED */
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -7750,7 +7750,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon)
mhd_assert (NULL == daemon->cleanup_head);
mhd_assert (NULL == daemon->suspended_connections_head);
mhd_assert (NULL == daemon->new_connections_head);
-#if defined(UPGRADE_SUPPORT) && defined (HTTPS_SUPPORT)
+#if defined(UPGRADE_SUPPORT) && defined(HTTPS_SUPPORT)
mhd_assert (NULL == daemon->urh_head);
#endif /* UPGRADE_SUPPORT && HTTPS_SUPPORT */
diff --git a/src/microhttpd/md5.c b/src/microhttpd/md5.c
@@ -150,7 +150,7 @@ MD5Transform (uint32_t state[4],
const uint32_t *in;
#if (_MHD_BYTE_ORDER == _MHD_LITTLE_ENDIAN) || \
- ! defined (_MHD_GET_32BIT_LE_UNALIGNED)
+ ! defined(_MHD_GET_32BIT_LE_UNALIGNED)
if (0 != (((uintptr_t) block) % _MHD_UINT32_ALIGN))
{
/* Copy data to the aligned buffer */
diff --git a/src/microhttpd/memorypool.c b/src/microhttpd/memorypool.c
@@ -47,7 +47,7 @@
#endif /* HAVE_SYSCONF */
#include "mhd_limits.h" /* for SIZE_MAX, PAGESIZE / PAGE_SIZE */
-#if defined(MHD_USE_PAGESIZE_MACRO) || defined (MHD_USE_PAGE_SIZE_MACRO)
+#if defined(MHD_USE_PAGESIZE_MACRO) || defined(MHD_USE_PAGE_SIZE_MACRO)
#ifndef HAVE_SYSCONF /* Avoid duplicate include */
#include <unistd.h>
#endif /* HAVE_SYSCONF */
diff --git a/src/microhttpd/mhd_align.h b/src/microhttpd/mhd_align.h
@@ -46,10 +46,10 @@
#endif /* !_MHD_ALIGNOF */
#ifdef _MHD_ALIGNOF
-#if (defined (__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 9 && \
+#if (defined(__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 9 && \
! defined(__clang__)) || \
- (defined (__clang__) && __clang_major__ < 8) || \
- (defined (__clang__) && __clang_major__ < 11 && \
+ (defined(__clang__) && __clang_major__ < 8) || \
+ (defined(__clang__) && __clang_major__ < 11 && \
defined(__apple_build_version__))
/* GCC before 4.9 and clang before 8.0 have incorrect implementation of 'alignof()'
which returns preferred alignment instead of minimal required alignment */
diff --git a/src/microhttpd/mhd_byteorder.h b/src/microhttpd/mhd_byteorder.h
@@ -87,7 +87,7 @@
#elif defined(__PDP_ENDIAN) && __BYTE_ORDER == __PDP_ENDIAN
#define _MHD_BYTE_ORDER _MHD_PDP_ENDIAN
#endif /* __BYTE_ORDER == __PDP_ENDIAN */
-#elif defined (BYTE_ORDER)
+#elif defined(BYTE_ORDER)
#if defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
#elif defined(LITTLE_ENDIAN) && BYTE_ORDER == LITTLE_ENDIAN
@@ -95,7 +95,7 @@
#elif defined(PDP_ENDIAN) && BYTE_ORDER == PDP_ENDIAN
#define _MHD_BYTE_ORDER _MHD_PDP_ENDIAN
#endif /* __BYTE_ORDER == _PDP_ENDIAN */
-#elif defined (_BYTE_ORDER)
+#elif defined(_BYTE_ORDER)
#if defined(_BIG_ENDIAN) && _BYTE_ORDER == _BIG_ENDIAN
#define _MHD_BYTE_ORDER _MHD_BIG_ENDIAN
#elif defined(_LITTLE_ENDIAN) && _BYTE_ORDER == _LITTLE_ENDIAN
@@ -122,7 +122,7 @@
defined(_M_X64) || defined(_M_AMD64) || defined(i386) || defined(__i386) || \
defined(__i386__) || defined(__i486__) || defined(__i586__) || \
defined(__i686__) || \
- defined(_M_IX86) || defined(_X86_) || defined (__THW_INTEL__)
+ defined(_M_IX86) || defined(_X86_) || defined(__THW_INTEL__)
/* x86 family is little endian */
#define _MHD_BYTE_ORDER _MHD_LITTLE_ENDIAN
#elif defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
diff --git a/src/microhttpd/mhd_mono_clock.c b/src/microhttpd/mhd_mono_clock.c
@@ -345,7 +345,7 @@ MHD_monotonic_sec_counter_init (void)
else
gettime_start = 0;
}
-#elif defined (HAVE_GETTIMEOFDAY)
+#elif defined(HAVE_GETTIMEOFDAY)
if (1)
{
struct timeval tv;
@@ -488,7 +488,7 @@ MHD_monotonic_msec_counter (void)
if (TIME_UTC == timespec_get (&ts, TIME_UTC))
return (uint64_t) (((uint64_t) (ts.tv_sec - gettime_start)) * 1000
+ (ts.tv_nsec / 1000000));
-#elif defined (HAVE_GETTIMEOFDAY)
+#elif defined(HAVE_GETTIMEOFDAY)
if (1)
{
struct timeval tv;
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
@@ -55,9 +55,9 @@
#include "mhd_limits.h"
#ifdef MHD_VECT_SEND
-#if (! defined (HAVE_SENDMSG) || ! defined(MSG_NOSIGNAL)) && \
- defined (MHD_SEND_SPIPE_SUPPRESS_POSSIBLE) && \
- defined (MHD_SEND_SPIPE_SUPPRESS_NEEDED)
+#if (! defined(HAVE_SENDMSG) || ! defined(MSG_NOSIGNAL)) && \
+ defined(MHD_SEND_SPIPE_SUPPRESS_POSSIBLE) && \
+ defined(MHD_SEND_SPIPE_SUPPRESS_NEEDED)
#define _MHD_VECT_SEND_NEEDS_SPIPE_SUPPRESSED 1
#endif /* (!HAVE_SENDMSG || !MSG_NOSIGNAL) &&
MHD_SEND_SPIPE_SUPPRESS_POSSIBLE && MHD_SEND_SPIPE_SUPPRESS_NEEDED */
@@ -1065,7 +1065,7 @@ MHD_send_hdr_and_body_ (struct MHD_Connection *connection,
msg.msg_iovlen = 2;
ret = sendmsg (s, &msg, MSG_NOSIGNAL_OR_ZERO);
-#elif defined (HAVE_WRITEV)
+#elif defined(HAVE_WRITEV)
ret = writev (s, vector, 2);
#endif /* HAVE_WRITEV */
#endif /* HAVE_SENDMSG || HAVE_WRITEV */
diff --git a/src/microhttpd/mhd_sockets.c b/src/microhttpd/mhd_sockets.c
@@ -526,7 +526,7 @@ MHD_socket_create_listen_ (int pf)
nosigpipe_set = (SOCK_NOSIGPIPE_OR_ZERO != 0);
#endif /* SOCK_NOSIGPIPE || MHD_socket_nosignal_ */
}
-#elif defined(MHD_WINSOCK_SOCKETS) && defined (WSA_FLAG_NO_HANDLE_INHERIT)
+#elif defined(MHD_WINSOCK_SOCKETS) && defined(WSA_FLAG_NO_HANDLE_INHERIT)
fd = WSASocketW (pf,
SOCK_STREAM,
0,
diff --git a/src/microhttpd/mhd_sockets.h b/src/microhttpd/mhd_sockets.h
@@ -45,7 +45,7 @@
#ifdef HAVE_STDDEF_H
#include <stddef.h>
#endif /* HAVE_STDDEF_H */
-#if defined(_MSC_FULL_VER) && ! defined (_SSIZE_T_DEFINED)
+#if defined(_MSC_FULL_VER) && ! defined(_SSIZE_T_DEFINED)
# include <stdint.h>
# define _SSIZE_T_DEFINED
typedef intptr_t ssize_t;
@@ -715,10 +715,10 @@ const char *MHD_W32_strerror_winsock_ (int err);
# define MHD_socket_set_error_(err) ( (MHD_SCKT_MISSING_ERR_CODE_ == (err)) ? \
(errno = EOPNOTSUPP) : (errno = \
(err)) )
-# elif defined (EFAULT)
+# elif defined(EFAULT)
# define MHD_socket_set_error_(err) ( (MHD_SCKT_MISSING_ERR_CODE_ == (err)) ? \
(errno = EFAULT) : (errno = (err)) )
-# elif defined (EINVAL)
+# elif defined(EINVAL)
# define MHD_socket_set_error_(err) ( (MHD_SCKT_MISSING_ERR_CODE_ == (err)) ? \
(errno = EINVAL) : (errno = (err)) )
# else /* !EOPNOTSUPP && !EFAULT && !EINVAL */
diff --git a/src/microhttpd/mhd_str.h b/src/microhttpd/mhd_str.h
@@ -38,7 +38,7 @@
#include <stdbool.h>
#endif /* HAVE_STDBOOL_H */
-#if defined(_MSC_FULL_VER) && ! defined (_SSIZE_T_DEFINED)
+#if defined(_MSC_FULL_VER) && ! defined(_SSIZE_T_DEFINED)
#define _SSIZE_T_DEFINED
typedef intptr_t ssize_t;
#endif /* !_SSIZE_T_DEFINED */
diff --git a/src/microhttpd/test_options.c b/src/microhttpd/test_options.c
@@ -84,7 +84,7 @@ test_ip_addr_option ()
{
struct MHD_Daemon *d;
struct sockaddr_in daemon_ip_addr;
-#if HAVE_INET6 && defined (USE_IPV6_TESTING)
+#if HAVE_INET6 && defined(USE_IPV6_TESTING)
struct sockaddr_in6 daemon_ip_addr6;
#endif
@@ -93,7 +93,7 @@ test_ip_addr_option ()
daemon_ip_addr.sin_port = 0;
daemon_ip_addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-#if HAVE_INET6 && defined (USE_IPV6_TESTING)
+#if HAVE_INET6 && defined(USE_IPV6_TESTING)
memset (&daemon_ip_addr6, 0, sizeof (struct sockaddr_in6));
daemon_ip_addr6.sin6_family = AF_INET6;
daemon_ip_addr6.sin6_port = 0;
@@ -109,7 +109,7 @@ test_ip_addr_option ()
MHD_stop_daemon (d);
-#if HAVE_INET6 && defined (USE_IPV6_TESTING)
+#if HAVE_INET6 && defined(USE_IPV6_TESTING)
d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_IPv6, 0,
NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR,
&daemon_ip_addr6, MHD_OPTION_END);
diff --git a/src/microhttpd/test_shutdown_select.c b/src/microhttpd/test_shutdown_select.c
@@ -135,7 +135,7 @@ start_socket_listen (int domain)
#if defined(MHD_POSIX_SOCKETS) && defined(SOCK_CLOEXEC)
fd = socket (domain, SOCK_STREAM | SOCK_CLOEXEC, 0);
cloexec_set = 1;
-#elif defined(MHD_WINSOCK_SOCKETS) && defined (WSA_FLAG_NO_HANDLE_INHERIT)
+#elif defined(MHD_WINSOCK_SOCKETS) && defined(WSA_FLAG_NO_HANDLE_INHERIT)
fd = WSASocketW (domain, SOCK_STREAM, 0, NULL, 0, WSA_FLAG_NO_HANDLE_INHERIT);
cloexec_set = 1;
#else /* !SOCK_CLOEXEC */
diff --git a/src/microhttpd/test_start_stop.c b/src/microhttpd/test_start_stop.c
@@ -134,7 +134,7 @@ main (int argc,
errorCount += testMultithreadedPoolGet (0);
#endif
errorCount += testExternalGet ();
-#if defined (MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
+#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
if (MHD_YES == MHD_is_feature_supported (MHD_FEATURE_POLL))
{
errorCount += testInternalGet (MHD_USE_POLL);
