diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-01-30 12:51:38 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-01-30 12:52:11 +0100 |
| commit | 2968329166f04b72c96dac975877deef2e013775 (patch) | |
| tree | 7e53575d1833bed90ed161cb131618f9b71aef97 | |
| parent | b5bf6ccf78412974d3ab0be3ec262dae3d8e0443 (diff) | |
fix #6693: get src/lib/ to build with clang
| -rw-r--r-- | src/include/microhttpd2.h | 9 | ||||
| -rw-r--r-- | src/lib/daemon_get_timeout.c | 2 | ||||
| -rw-r--r-- | src/lib/daemon_select.c | 2 |
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; #define _MHD_INSTRMACRO(a) #a #define _MHD_STRMACRO(a) _MHD_INSTRMACRO (a) /* deprecation message */ -#define _MHD_DEPR_MACRO(msg) __pragma (message (__FILE__ "(" _MHD_STRMACRO ( \ - __LINE__) "): warning: " msg)) +#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__) /* clang or GCC since 3.0 */ -#define _MHD_GCC_PRAG(x) _Pragma (#x) +#define _MHD_GCC_PRAG(x) _Pragma(#x) #if (defined(__clang__) && (__clang_major__ + 0 >= 5 || \ (! defined(__apple_build_version__) && \ (__clang_major__ + 0 > 3 || (__clang_major__ + 0 == 3 && __clang_minor__ >= \ @@ -280,7 +280,8 @@ typedef SOCKET MHD_socket; * Macro to indicate that certain parameters must be * non-null. Todo: port to non-gcc platforms. */ -#if defined(__CYGWIN__) || defined(_WIN32) || defined(MHD_W32LIB) +#if defined(__CYGWIN__) || defined(_WIN32) || defined(MHD_W32LIB) || \ + defined(__clang__) || ! defined(__GNUC__) #define MHD_NONNULL(...) /* empty */ #else #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, MHD_SC_CONFIGURATION_MISMATCH_FOR_GET_TIMEOUT, _ ("Illegal call to MHD_get_timeout.\n")); #endif - return MHD_SC_CONFIGURATION_MISSMATCH_FOR_GET_TIMEOUT; + return MHD_SC_CONFIGURATION_MISMATCH_FOR_GET_TIMEOUT; } 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, { if ( (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode) || (MHD_ELS_POLL == daemon->event_loop_syscall) ) - return MHD_SC_CONFIGURATION_MISSMATCH_FOR_RUN_SELECT; + return MHD_SC_CONFIGURATION_MISMATCH_FOR_RUN_SELECT; if (MHD_ELS_EPOLL == daemon->event_loop_syscall) { #ifdef EPOLL_SUPPORT |