From e2d080612f566205d16a65fdad05618f92774d4c Mon Sep 17 00:00:00 2001 From: Lloyd Hilaiel Date: Mon, 20 Jun 2011 09:40:03 -0600 Subject: look for either _WIN32 or WIN32 on windows. closes #44 --- src/api/yajl_common.h | 2 +- src/yajl_gen.c | 2 +- src/yajl_tree.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/yajl_common.h b/src/api/yajl_common.h index 49ca3a5..b208fd7 100644 --- a/src/api/yajl_common.h +++ b/src/api/yajl_common.h @@ -28,7 +28,7 @@ extern "C" { /* msft dll export gunk. To build a DLL on windows, you * must define WIN32, YAJL_SHARED, and YAJL_BUILD. To use a shared * DLL, you must define YAJL_SHARED and WIN32 */ -#if defined(WIN32) && defined(YAJL_SHARED) +#if (defined(_WIN32) || defined(WIN32)) && defined(YAJL_SHARED) # ifdef YAJL_BUILD # define YAJL_API __declspec(dllexport) # else diff --git a/src/yajl_gen.c b/src/yajl_gen.c index 3d42f4d..8605982 100644 --- a/src/yajl_gen.c +++ b/src/yajl_gen.c @@ -208,7 +208,7 @@ yajl_gen_integer(yajl_gen g, long long int number) return yajl_gen_status_ok; } -#ifdef WIN32 +#if defined(_WIN32) || defined(WIN32) #include #define isnan _isnan #define isinf !_finite diff --git a/src/yajl_tree.c b/src/yajl_tree.c index 8f871a4..111e49f 100644 --- a/src/yajl_tree.c +++ b/src/yajl_tree.c @@ -25,7 +25,7 @@ #include "yajl_parser.h" -#ifdef WIN32 +#if defined(_WIN32) || defined(WIN32) #define snprintf sprintf_s #endif -- cgit v1.2.1