Fixes #160 'missing header file on windows'

3 files changed, 117 insertions, 29 deletions

diff --git a/config.h.win32 b/config.h.win32
index ec3a84a..6515945 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,26 +1,42 @@
-/*
- * $Id: config.h.win32,v 1.2 2006/01/26 02:16:28 mclark Exp $
- *
- * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
- * Michael Clark <michael@metaparadigm.com>
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See COPYING for details.
- *
- */
-
-/* config.h.win32  Generated by configure.  */
-
-#define PACKAGE_STRING "JSON C Library 0.2"
-#define PACKAGE_BUGREPORT "json-c@googlegroups.com"
-#define PACKAGE_NAME "JSON C Library"
-#define PACKAGE_TARNAME "json-c"
-#define PACKAGE_VERSION "0.2"
-

 /* config.h.in.  Generated from configure.ac by autoheader.  */

 

+/* Enable RDRANR Hardware RNG Hash Seed */

+#undef ENABLE_RDRAND

+

+/* Define if .gnu.warning accepts long strings. */

+#undef HAS_GNU_WARNING_LONG

+

+/* Define to 1 if you have the declaration of `INFINITY', and to 0 if you

+   don't. */

+#define HAVE_DECL_INFINITY 1

+

+/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.

+   */

+#define HAVE_DECL_ISINF 1

+

+/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.

+   */

+#define HAVE_DECL_ISNAN 1

+

+/* Define to 1 if you have the declaration of `nan', and to 0 if you don't. */

+#define HAVE_DECL_NAN 1

+

+/* Define to 1 if you have the declaration of `_finite', and to 0 if you

+   don't. */

+#define HAVE_DECL__FINITE 0

+

+/* Define to 1 if you have the declaration of `_isnan', and to 0 if you don't.

+   */

+#define HAVE_DECL__ISNAN 0

+

+/* Define to 1 if you have the <dlfcn.h> header file. */

+#undef HAVE_DLFCN_H

+

 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */

-/* #undef HAVE_DOPRNT */

+#undef HAVE_DOPRNT

+

+/* Define to 1 if you have the <endian.h> header file. */

+#define HAVE_ENDIAN_H 1

 

 /* Define to 1 if you have the <fcntl.h> header file. */

 #define HAVE_FCNTL_H 1

@@ -31,6 +47,9 @@
 /* Define to 1 if you have the <limits.h> header file. */

 #define HAVE_LIMITS_H 1

 

+/* Define to 1 if you have the <locale.h> header file. */

+#define HAVE_LOCALE_H 1

+

 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and

    to 0 otherwise. */

 #define HAVE_MALLOC 1

@@ -43,19 +62,28 @@
 

 /* Define to 1 if your system has a GNU libc compatible `realloc' function,

    and to 0 otherwise. */

-#define HAVE_REALLOC 1
-
+#define HAVE_REALLOC 1

+

+/* Define to 1 if you have the `setlocale' function. */

+#define HAVE_SETLOCALE 1

+

+/* Define to 1 if you have the `snprintf' function. */

+#undef HAVE_SNPRINTF

+

+/* Define to 1 if you have the <stdarg.h> header file. */

+#define HAVE_STDARG_H 1

+

 /* Define to 1 if you have the <stdint.h> header file. */

 #define HAVE_STDINT_H 1

 

 /* Define to 1 if you have the <stdlib.h> header file. */

 #define HAVE_STDLIB_H 1

 

-/* Define to 1 if you have the `strdup' function. */

-#undef HAVE_STRNDUP

+/* Define to 1 if you have the `strcasecmp' function. */

+#define HAVE_STRCASECMP 1

 

-/* Define to 1 if you have the <stdarg.h> header file. */

-#define HAVE_STDARG_H 1

+/* Define to 1 if you have the `strdup' function. */

+#define HAVE_STRDUP 1

 

 /* Define to 1 if you have the `strerror' function. */

 #define HAVE_STRERROR 1

@@ -66,9 +94,15 @@
 /* Define to 1 if you have the <string.h> header file. */

 #define HAVE_STRING_H 1

 

+/* Define to 1 if you have the `strncasecmp' function. */

+#define HAVE_STRNCASECMP 1

+

 /* Define to 1 if you have the <syslog.h> header file. */

 #undef HAVE_SYSLOG_H

 

+/* Define to 1 if you have the <sys/cdefs.h> header file. */

+#undef HAVE_SYS_CDEFS_H

+

 /* Define to 1 if you have the <sys/param.h> header file. */

 #undef HAVE_SYS_PARAM_H

 

@@ -81,14 +115,60 @@
 /* Define to 1 if you have the <unistd.h> header file. */

 #undef HAVE_UNISTD_H

 

+/* Define to 1 if you have the `vasprintf' function. */

+#undef HAVE_VASPRINTF

+

 /* Define to 1 if you have the `vprintf' function. */

 #undef HAVE_VPRINTF

 

+/* Define to 1 if you have the `vsnprintf' function. */

+#undef HAVE_VSNPRINTF

+

 /* Define to 1 if you have the `vsyslog' function. */

 #undef HAVE_VSYSLOG

 

-/* Define to 1 if you have the `strncasecmp' function. */

-#undef HAVE_STRNCASECMP

+/* 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

+

+/* Name of package */

+#define PACKAGE "json-c"

+

+/* Define to the address where bug reports for this package should be sent. */

+#define PACKAGE_BUGREPORT "json-c@googlegroups.com"

+

+/* Define to the full name of this package. */

+#define PACKAGE_NAME "JSON C Library"

+

+/* Define to the full name and version of this package. */

+#define PACKAGE_STRING "JSON C Library 0.12.99"

+

+/* Define to the one symbol short name of this package. */

+#define PACKAGE_TARNAME "json-c"

+

+/* Define to the home page for this package. */

+#define PACKAGE_URL "https://github.com/json-c/json-c"

+

+/* Define to the version of this package. */

+#define PACKAGE_VERSION "0.12.99"

 

 /* Define to 1 if you have the ANSI C header files. */

-#define STDC_HEADERS 1
+#define STDC_HEADERS 1

+

+/* Version number of package */

+#define VERSION "0.12.99"

+

+/* Define to empty if `const' does not conform to ANSI C. */

+/* #undef const */

+

+/* Define to rpl_malloc if the replacement function should be used. */

+/* #undef malloc */

+

+/* Define to rpl_realloc if the replacement function should be used. */

+/* #undef realloc */

+

+/* Define to `unsigned int' if <sys/types.h> does not define. */

+/* #undef size_t */

diff --git a/json_config.h.win32 b/json_config.h.win32
new file mode 100644
index 0000000..405fda2
--- /dev/null
+++ b/json_config.h.win32
@@ -0,0 +1,3 @@
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define JSON_C_HAVE_INTTYPES_H 1
diff --git a/linkhash.c b/linkhash.c
index 712c387..630ed0c 100644
--- a/linkhash.c
+++ b/linkhash.c
@@ -21,6 +21,11 @@
 # include <endian.h>    /* attempt to define endianness */
 #endif
 
+#ifdef _MSC_VER
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>   /* Get InterlockedCompareExchange */
+#endif
+
 #include "random_seed.h"
 #include "linkhash.h"