You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2017/09/29 18:39:04 UTC
nifi-minifi-cpp git commit: MINIFICPP-109: Add header guards for
civetweb so users who don't have pragma defs can build.
Repository: nifi-minifi-cpp
Updated Branches:
refs/heads/master 7c24ed7e6 -> f5832facf
MINIFICPP-109: Add header guards for civetweb so users who don't have pragma defs can build.
Pulled from merged PR located at :
https://github.com/KevinCalderone/civetweb/commit/1b25c739802bac622edc83f9ca9f0f9e695879a4
This closes #138.
Signed-off-by: Aldrin Piri <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/f5832fac
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/f5832fac
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/f5832fac
Branch: refs/heads/master
Commit: f5832facf31eaab66055340c500d6b39c50f7321
Parents: 7c24ed7
Author: Marc Parisi <ph...@apache.org>
Authored: Mon Sep 25 11:29:03 2017 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Fri Sep 29 14:38:02 2017 -0400
----------------------------------------------------------------------
thirdparty/civetweb-1.9.1/src/civetweb.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/f5832fac/thirdparty/civetweb-1.9.1/src/civetweb.c
----------------------------------------------------------------------
diff --git a/thirdparty/civetweb-1.9.1/src/civetweb.c b/thirdparty/civetweb-1.9.1/src/civetweb.c
index 1aa0de6..c2dc49a 100644
--- a/thirdparty/civetweb-1.9.1/src/civetweb.c
+++ b/thirdparty/civetweb-1.9.1/src/civetweb.c
@@ -137,10 +137,12 @@ mg_static_assert(sizeof(void *) >= sizeof(int), "data type size check");
#ifdef __MACH__ /* Apple OSX section */
#ifdef __clang__
-/* Avoid warnings for Xopen 7.00 and higher */
+#if (__clang_major__ == 3) && ((__clang_minor__ == 7) || (__clang_minor__ == 8))
+/* Avoid warnings for Xcode 7. It seems it does no longer exist in Xcode 8 */
#pragma clang diagnostic ignored "-Wno-reserved-id-macro"
#pragma clang diagnostic ignored "-Wno-keyword-macro"
#endif
+#endif
#define CLOCK_MONOTONIC (1)
#define CLOCK_REALTIME (2)