@@ -44,6 +44,7 @@ ENDIF (NOT CMAKE_BUILD_TYPE) SET(CMAKE_C_FLAGS "-Wall") IF (WIN32) + ADD_DEFINITIONS(-DWIN32) SET(linkFlags "/PDB:NONE /INCREMENTAL:NO /OPT:NOREF /OPT:NOICF") SET(CMAKE_EXE_LINKER_FLAGS "${linkFlags}" CACHE STRING "YAJL linker flags" FORCE) CMakeLists.txt @@ -146,7 +146,7 @@ main(int argc, char ** argv) /* check arguments.*/ int a = 1; while ((a < argc) && (argv[a][0] == '-') && (strlen(argv[a]) > 1)) { - int i; + unsigned int i; for ( i=1; i < strlen(argv[a]); i++) { switch (argv[a][i]) { case 'm': reformatter/json_reformat.c @@ -172,6 +172,12 @@ yajl_gen_integer(yajl_gen g, long int number) return yajl_gen_status_ok; } +#ifdef WIN32 +#include <float.h> +#define isnan _isnan +#define isinf _finite +#endif + yajl_gen_status yajl_gen_double(yajl_gen g, double number) { src/yajl_gen.c @@ -62,7 +62,7 @@ main(int argc, char ** argv) /* check arguments.*/ int a = 1; while ((a < argc) && (argv[a][0] == '-') && (strlen(argv[a]) > 1)) { - int i; + unsigned int i; for ( i=1; i < strlen(argv[a]); i++) { switch (argv[a][i]) { case 'q': verify/json_verify.c 532e9d978ace625efc9bcbe88c8d4b25e69b1ba8 Lloyd Hilaiel lloyd@hilaiel.com http://github.com/lloyd/yajl/commit/7452dc0e80c85196ea3f6b71143be6f10e600f7b 7452dc0e80c85196ea3f6b71143be6f10e600f7b 2009-10-19T06:33:57-07:00 2009-10-19T06:33:57-07:00 fix win32 compilation after addition of isnan() isinf() checks, address a couple sign mismatches in comparison 67df13c1b959a8614dc48ecf34082aef6bbf9f0e Lloyd Hilaiel lloyd@hilaiel.com