projects
/
openwrt
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools/cmake: update to 3.10.1
[openwrt/.git]
/
tools
/
cmake
/
patches
/
110-alpine_musl-compat.patch
diff --git
a/tools/cmake/patches/110-alpine_musl-compat.patch
b/tools/cmake/patches/110-alpine_musl-compat.patch
index ae93201e53659514e2a63fc813622302bde5be59..a2c84fca4a1f18e5f3c1665589fbc4289e6caddc 100644
(file)
--- a/
tools/cmake/patches/110-alpine_musl-compat.patch
+++ b/
tools/cmake/patches/110-alpine_musl-compat.patch
@@
-1,6
+1,6
@@
--- a/Utilities/cmjsoncpp/include/json/assertions.h
+++ b/Utilities/cmjsoncpp/include/json/assertions.h
--- a/Utilities/cmjsoncpp/include/json/assertions.h
+++ b/Utilities/cmjsoncpp/include/json/assertions.h
-@@ -6,1
2
+6,12 @@
+@@ -6,1
1
+6,12 @@
#ifndef CPPTL_JSON_ASSERTIONS_H_INCLUDED
#define CPPTL_JSON_ASSERTIONS_H_INCLUDED
#ifndef CPPTL_JSON_ASSERTIONS_H_INCLUDED
#define CPPTL_JSON_ASSERTIONS_H_INCLUDED
@@
-11,7
+11,6
@@
#endif // if !defined(JSON_IS_AMALGAMATION)
-#include <stdlib.h>
#endif // if !defined(JSON_IS_AMALGAMATION)
-#include <stdlib.h>
--
- #if JSON_USE_EXCEPTION
- #include <stdexcept>
- #define JSON_ASSERT(condition) \
+ #include <sstream>
+
+ /** It should not be possible for a maliciously designed file to