mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
63dc46aa3a
internal jsoncpp include order leads to multiple build
errors on Alpine Linux which uses musl libc
use include order from upstream jsoncpp
first error was:
In file included from /usr/include/c++/5.3.0/stdexcept:38:0,
from /home/..../openwrt/build_dir/host/cmake-3.4.3/Utilities/cmjsoncpp/include/json/assertions.h:16,
from /home/..../openwrt/build_dir/host/cmake-3.4.3/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp:7:
/usr/include/c++/5.3.0/exception:35:9: error: '#pragma' is not allowed here
#pragma GCC visibility push(default)
Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
SVN-Revision: 48995
18 lines
486 B
Diff
18 lines
486 B
Diff
--- a/Utilities/cmjsoncpp/include/json/assertions.h
|
|
+++ b/Utilities/cmjsoncpp/include/json/assertions.h
|
|
@@ -6,12 +6,12 @@
|
|
#ifndef CPPTL_JSON_ASSERTIONS_H_INCLUDED
|
|
#define CPPTL_JSON_ASSERTIONS_H_INCLUDED
|
|
|
|
+#include <stdlib.h>
|
|
+
|
|
#if !defined(JSON_IS_AMALGAMATION)
|
|
#include "config.h"
|
|
#endif // if !defined(JSON_IS_AMALGAMATION)
|
|
|
|
-#include <stdlib.h>
|
|
-
|
|
#if JSON_USE_EXCEPTION
|
|
#include <stdexcept>
|
|
#define JSON_ASSERT(condition) \
|