Updated config for vs2010/winsdk71 as well as vs2013

Define JSON_C_HAVE_INTTYPES_H in json_config.h.win32 only

diff --git a/config.h.in b/config.h.in
index 0dcab1a30015f1c1b7c4ea5df425f67b07eaf8f1..af2e5fc2102aa17cf595cd29134c5df140df37d3 100644 (file)
--- 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 65159456abd86658628e6949080bcb1401a7daf2..de6bc3c5b4129f156ecc8a7652499b13c27bc0e8 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -8,35 +8,43 @@
 \r
 /* Define to 1 if you have the declaration of `INFINITY', and to 0 if you\r
    don't. */\r
+#if defined(_MSC_VER) && _MSC_VER >= 1800\r
 #define HAVE_DECL_INFINITY 1\r
+#endif\r
 \r
 /* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.\r
    */\r
+#if defined(_MSC_VER) && _MSC_VER >= 1800\r
 #define HAVE_DECL_ISINF 1\r
+#endif\r
 \r
 /* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.\r
    */\r
+#if defined(_MSC_VER) && _MSC_VER >= 1800\r
 #define HAVE_DECL_ISNAN 1\r
+#endif\r
 \r
 /* Define to 1 if you have the declaration of `nan', and to 0 if you don't. */\r
+#if defined(_MSC_VER) && _MSC_VER >= 1800\r
 #define HAVE_DECL_NAN 1\r
+#endif\r
 \r
 /* Define to 1 if you have the declaration of `_finite', and to 0 if you\r
    don't. */\r
-#define HAVE_DECL__FINITE 0\r
+#define HAVE_DECL__FINITE 1\r
 \r
 /* Define to 1 if you have the declaration of `_isnan', and to 0 if you don't.\r
    */\r
-#define HAVE_DECL__ISNAN 0\r
+#define HAVE_DECL__ISNAN 1\r
 \r
 /* Define to 1 if you have the <dlfcn.h> header file. */\r
-#undef HAVE_DLFCN_H\r
+#define HAVE_DLFCN_H 1\r
 \r
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */\r
-#undef HAVE_DOPRNT\r
+#define HAVE_DOPRNT 1\r
 \r
 /* Define to 1 if you have the <endian.h> header file. */\r
-#define HAVE_ENDIAN_H 1\r
+#undef HAVE_ENDIAN_H\r
 \r
 /* Define to 1 if you have the <fcntl.h> header file. */\r
 #define HAVE_FCNTL_H 1\r
@@ -58,7 +66,7 @@
 #define HAVE_MEMORY_H 1\r
 \r
 /* Define to 1 if you have the `open' function. */\r
-#undef HAVE_OPEN\r
+#define HAVE_OPEN 1\r
 \r
 /* Define to 1 if your system has a GNU libc compatible `realloc' function,\r
    and to 0 otherwise. */\r
@@ -95,13 +103,13 @@
 #define HAVE_STRING_H 1\r
 \r
 /* Define to 1 if you have the `strncasecmp' function. */\r
-#define HAVE_STRNCASECMP 1\r
+#undef HAVE_STRNCASECMP\r
 \r
 /* Define to 1 if you have the <syslog.h> header file. */\r
 #undef HAVE_SYSLOG_H\r
 \r
 /* Define to 1 if you have the <sys/cdefs.h> header file. */\r
-#undef HAVE_SYS_CDEFS_H\r
+#define HAVE_SYS_CDEFS_H 1\r
 \r
 /* Define to 1 if you have the <sys/param.h> header file. */\r
 #undef HAVE_SYS_PARAM_H\r
@@ -119,21 +127,21 @@
 #undef HAVE_VASPRINTF\r
 \r
 /* Define to 1 if you have the `vprintf' function. */\r
-#undef HAVE_VPRINTF\r
+#define HAVE_VPRINTF 1\r
 \r
 /* Define to 1 if you have the `vsnprintf' function. */\r
-#undef HAVE_VSNPRINTF\r
+#define HAVE_VSNPRINTF 1\r
 \r
 /* Define to 1 if you have the `vsyslog' function. */\r
 #undef HAVE_VSYSLOG\r
 \r
-/* Public define for json_inttypes.h */\r
-#define JSON_C_HAVE_INTTYPES_H 1\r
-\r
 /* Define to the sub-directory in which libtool stores uninstalled libraries.\r
    */\r
 #undef LT_OBJDIR\r
 \r
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */\r
+/* #undef NO_MINUS_C_MINUS_O */\r
+\r
 /* Name of package */\r
 #define PACKAGE "json-c"\r
 \r

diff --git a/json_config.h.win32 b/json_config.h.win32
index 405fda20dc5bd0dc4860716960c15e956ddf15e5..9c542a40863e2a7bb1a36b0d5e452d94b893dcbd 100644 (file)
--- a/json_config.h.win32
+++ b/json_config.h.win32
@@ -1,3 +1,5 @@
 
 /* Define to 1 if you have the <inttypes.h> header file. */
+#if defined(_MSC_VER) && _MSC_VER >= 1800
 #define JSON_C_HAVE_INTTYPES_H 1
+#endif