Skip to content

Commit d33e6b2

Browse files
authored
Merge pull request #45 from awslabs/FB-AndroidFixes
Alternate way of setting up isfinite checks that compiles under ndk13b as well
2 parents 97a585a + b239294 commit d33e6b2

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

aws-cpp-sdk-core/source/external/json-cpp/jsoncpp.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3070,7 +3070,8 @@ Value& Path::make(Value& root) const {
30703070
// recognized in your jurisdiction.
30713071
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
30723072

3073-
#include <cmath>
3073+
#include <math.h>
3074+
//#include <cmath>
30743075

30753076
#if !defined(AWS_JSON_IS_AMALGAMATION)
30763077
#include <json/writer.h>
@@ -3098,7 +3099,11 @@ Value& Path::make(Value& root) const {
30983099

30993100
#else
31003101

3102+
#ifdef isfinite
3103+
#define IS_FINITE isfinite
3104+
#else
31013105
#define IS_FINITE std::isfinite
3106+
#endif
31023107

31033108
#endif
31043109

0 commit comments

Comments
 (0)