gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [libmicrohttpd] branch master updated: fix warnings for __c


From: gnunet
Subject: [GNUnet-SVN] [libmicrohttpd] branch master updated: fix warnings for __clang_major__ for non-clang compilers
Date: Thu, 04 Jan 2018 12:25:15 +0100

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new 867c58ad fix warnings for __clang_major__ for non-clang compilers
867c58ad is described below

commit 867c58add0afec519607b27fd64beb0190212f36
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Jan 4 12:25:07 2018 +0100

    fix warnings for __clang_major__ for non-clang compilers
---
 ChangeLog                | 4 ++++
 src/include/microhttpd.h | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c2ea8614..d2695a12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan  4 12:24:33 CET 2018
+       Fix __clang_major__ related warnings for non-clang
+       compilers reported by Tim on the mailinglist. -CG
+
 Mon Dec 11 17:11:00 MSK 2017
        Fixed tests on platforms with huge number of CPUs.
        Doxygen configuration was updated.
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 303d7824..0ce62d42 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -212,8 +212,8 @@ typedef SOCKET MHD_socket;
 #elif defined(__clang__) || defined (__GNUC_PATCHLEVEL__)
 /* clang or GCC since 3.0 */
 #define _MHD_GCC_PRAG(x) _Pragma (#x)
-#if __clang_major__+0 >= 5 || \
-  (!defined(__apple_build_version__) && (__clang_major__+0  > 3 || 
(__clang_major__+0 == 3 && __clang_minor__ >= 3))) || \
+#if (defined(__clang__) && (__clang_major__+0 >= 5 ||                  \
+                           (!defined(__apple_build_version__) && 
(__clang_major__+0  > 3 || (__clang_major__+0 == 3 && __clang_minor__ >= 3))))) 
|| \
   __GNUC__+0 > 4 || (__GNUC__+0 == 4 && __GNUC_MINOR__+0 >= 8)
 /* clang >= 3.3 (or XCode's clang >= 5.0) or
    GCC >= 4.8 */
@@ -222,7 +222,7 @@ typedef SOCKET MHD_socket;
 #else /* older clang or GCC */
 /* clang < 3.3, XCode's clang < 5.0, 3.0 <= GCC < 4.8 */
 #define _MHD_DEPR_MACRO(msg) _MHD_GCC_PRAG(message msg)
-#if (__clang_major__+0  > 2 || (__clang_major__+0 == 2 && __clang_minor__ >= 
9)) /* FIXME: clang >= 2.9, earlier versions not tested */
+#if (defined(__clang__) && (__clang_major__+0  > 2 || (__clang_major__+0 == 2 
&& __clang_minor__ >= 9))) /* FIXME: clang >= 2.9, earlier versions not tested 
*/
 /* clang handles inline pragmas better than GCC */
 #define _MHD_DEPR_IN_MACRO(msg) _MHD_DEPR_MACRO(msg)
 #endif /* clang >= 2.9 */

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]