From a74f6b28671955c2472b1d68ee0b87b25aa12156 Mon Sep 17 00:00:00 2001 From: James Myatt Date: Thu, 5 Feb 2015 15:54:19 +0000 Subject: [PATCH] Updated config for vs2010/winsdk71 as well as vs2013 Define JSON_C_HAVE_INTTYPES_H in json_config.h.win32 only --- config.h.in | 3 +++ config.h.win32 | 34 +++++++++++++++++++++------------- json_config.h.win32 | 2 ++ 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/config.h.in b/config.h.in index 0dcab1a..af2e5fc 100644 --- a/config.h.in +++ b/config.h.in @@ -134,6 +134,9 @@ */ #undef LT_OBJDIR +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + /* Name of package */ #undef PACKAGE diff --git a/config.h.win32 b/config.h.win32 index 6515945..de6bc3c 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -8,35 +8,43 @@ /* Define to 1 if you have the declaration of `INFINITY', and to 0 if you don't. */ +#if defined(_MSC_VER) && _MSC_VER >= 1800 #define HAVE_DECL_INFINITY 1 +#endif /* Define to 1 if you have the declaration of `isinf', and to 0 if you don't. */ +#if defined(_MSC_VER) && _MSC_VER >= 1800 #define HAVE_DECL_ISINF 1 +#endif /* Define to 1 if you have the declaration of `isnan', and to 0 if you don't. */ +#if defined(_MSC_VER) && _MSC_VER >= 1800 #define HAVE_DECL_ISNAN 1 +#endif /* Define to 1 if you have the declaration of `nan', and to 0 if you don't. */ +#if defined(_MSC_VER) && _MSC_VER >= 1800 #define HAVE_DECL_NAN 1 +#endif /* Define to 1 if you have the declaration of `_finite', and to 0 if you don't. */ -#define HAVE_DECL__FINITE 0 +#define HAVE_DECL__FINITE 1 /* Define to 1 if you have the declaration of `_isnan', and to 0 if you don't. */ -#define HAVE_DECL__ISNAN 0 +#define HAVE_DECL__ISNAN 1 /* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H +#define HAVE_DLFCN_H 1 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -#undef HAVE_DOPRNT +#define HAVE_DOPRNT 1 /* Define to 1 if you have the header file. */ -#define HAVE_ENDIAN_H 1 +#undef HAVE_ENDIAN_H /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 @@ -58,7 +66,7 @@ #define HAVE_MEMORY_H 1 /* Define to 1 if you have the `open' function. */ -#undef HAVE_OPEN +#define HAVE_OPEN 1 /* Define to 1 if your system has a GNU libc compatible `realloc' function, and to 0 otherwise. */ @@ -95,13 +103,13 @@ #define HAVE_STRING_H 1 /* Define to 1 if you have the `strncasecmp' function. */ -#define HAVE_STRNCASECMP 1 +#undef HAVE_STRNCASECMP /* Define to 1 if you have the header file. */ #undef HAVE_SYSLOG_H /* Define to 1 if you have the header file. */ -#undef HAVE_SYS_CDEFS_H +#define HAVE_SYS_CDEFS_H 1 /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H @@ -119,21 +127,21 @@ #undef HAVE_VASPRINTF /* Define to 1 if you have the `vprintf' function. */ -#undef HAVE_VPRINTF +#define HAVE_VPRINTF 1 /* Define to 1 if you have the `vsnprintf' function. */ -#undef HAVE_VSNPRINTF +#define HAVE_VSNPRINTF 1 /* Define to 1 if you have the `vsyslog' function. */ #undef HAVE_VSYSLOG -/* Public define for json_inttypes.h */ -#define JSON_C_HAVE_INTTYPES_H 1 - /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ + /* Name of package */ #define PACKAGE "json-c" diff --git a/json_config.h.win32 b/json_config.h.win32 index 405fda2..9c542a4 100644 --- a/json_config.h.win32 +++ b/json_config.h.win32 @@ -1,3 +1,5 @@ /* Define to 1 if you have the header file. */ +#if defined(_MSC_VER) && _MSC_VER >= 1800 #define JSON_C_HAVE_INTTYPES_H 1 +#endif -- 2.49.0