aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-01-30 12:51:38 +0100
committerChristian Grothoff <christian@grothoff.org>2021-01-30 12:52:11 +0100
commit2968329166f04b72c96dac975877deef2e013775 (patch)
tree7e53575d1833bed90ed161cb131618f9b71aef97
parentb5bf6ccf78412974d3ab0be3ec262dae3d8e0443 (diff)
downloadlibmicrohttpd-2968329166f04b72c96dac975877deef2e013775.tar.gz
libmicrohttpd-2968329166f04b72c96dac975877deef2e013775.zip
fix #6693: get src/lib/ to build with clang
-rw-r--r--src/include/microhttpd2.h9
-rw-r--r--src/lib/daemon_get_timeout.c2
-rw-r--r--src/lib/daemon_select.c2
3 files changed, 7 insertions, 6 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__))
diff --git a/src/lib/daemon_get_timeout.c b/src/lib/daemon_get_timeout.c
index 01cb148a..6fa72478 100644
--- a/src/lib/daemon_get_timeout.c
+++ b/src/lib/daemon_get_timeout.c
@@ -60,7 +60,7 @@ MHD_daemon_get_timeout (struct MHD_Daemon *daemon,
60 MHD_SC_CONFIGURATION_MISMATCH_FOR_GET_TIMEOUT, 60 MHD_SC_CONFIGURATION_MISMATCH_FOR_GET_TIMEOUT,
61 _ ("Illegal call to MHD_get_timeout.\n")); 61 _ ("Illegal call to MHD_get_timeout.\n"));
62#endif 62#endif
63 return MHD_SC_CONFIGURATION_MISSMATCH_FOR_GET_TIMEOUT; 63 return MHD_SC_CONFIGURATION_MISMATCH_FOR_GET_TIMEOUT;
64 } 64 }
65 65
66 if (daemon->data_already_pending) 66 if (daemon->data_already_pending)
diff --git a/src/lib/daemon_select.c b/src/lib/daemon_select.c
index 0f32b6b8..23ce556f 100644
--- a/src/lib/daemon_select.c
+++ b/src/lib/daemon_select.c
@@ -616,7 +616,7 @@ MHD_daemon_run_from_select (struct MHD_Daemon *daemon,
616{ 616{
617 if ( (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode) || 617 if ( (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode) ||
618 (MHD_ELS_POLL == daemon->event_loop_syscall) ) 618 (MHD_ELS_POLL == daemon->event_loop_syscall) )
619 return MHD_SC_CONFIGURATION_MISSMATCH_FOR_RUN_SELECT; 619 return MHD_SC_CONFIGURATION_MISMATCH_FOR_RUN_SELECT;
620 if (MHD_ELS_EPOLL == daemon->event_loop_syscall) 620 if (MHD_ELS_EPOLL == daemon->event_loop_syscall)
621 { 621 {
622#ifdef EPOLL_SUPPORT 622#ifdef EPOLL_SUPPORT