diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-05-20 10:59:04 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-05-20 10:59:04 -0700 |
| commit | 4b858eb5b567fd409a236b7443ec3fd9809074cc (patch) | |
| tree | 8e620005bde993cdc1e91b01af59eeae25baa98e /ext | |
| parent | 566a5b8cddf2f24e5ae3435c7c99250b9b27de2f (diff) | |
| download | libyajl2-gem-4b858eb5b567fd409a236b7443ec3fd9809074cc.tar.gz | |
move hacking up the sources to 'rake prep'
add patch to compile on windows
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/libyajl2/patches/000-mingw-gcc.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/ext/libyajl2/patches/000-mingw-gcc.patch b/ext/libyajl2/patches/000-mingw-gcc.patch new file mode 100644 index 0000000..b714ca9 --- /dev/null +++ b/ext/libyajl2/patches/000-mingw-gcc.patch @@ -0,0 +1,26 @@ +diff --git a/src/yajl_gen.c b/src/yajl_gen.c +index 0f5c68e..a86a6ed 100644 +--- a/src/yajl_gen.c ++++ b/src/yajl_gen.c +@@ -217,7 +217,7 @@ yajl_gen_integer(yajl_gen g, long long int number) + return yajl_gen_status_ok; + } + +-#if defined(_WIN32) || defined(WIN32) ++#if ( defined(_WIN32) || defined(WIN32) ) && !defined(__GCC__) + #include <float.h> + #define isnan _isnan + #define isinf !_finite +diff --git a/src/yajl_tree.c b/src/yajl_tree.c +index 3d357a3..2b4c183 100644 +--- a/src/yajl_tree.c ++++ b/src/yajl_tree.c +@@ -25,7 +25,7 @@ + + #include "yajl_parser.h" + +-#if defined(_WIN32) || defined(WIN32) ++#if ( defined(_WIN32) || defined(WIN32) ) && !defined(__GCC__) + #define snprintf sprintf_s + #endif + |