mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-02 20:09:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #171 from Nzbuu/vs2010_build

Browse Source 
Update configuration for VS2010 and win64
This commit is contained in:
Eric Haszlakiewicz
2015-05-08 21:31:37 -04:00
parent e1eb298de1 736f4b3581
commit e4fce5d6ae
12 changed files with 147 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -49,6 +49,8 @@
/tests/*.trs /tests/*.trs
/Debug /Debug
/Release /Release
/*/Debug
/*/Release
*.lo *.lo
*.o *.o
/libjson-c.la /libjson-c.la

3
config.h.in
View File

@@ -134,6 +134,9 @@
*/ */
#undef LT_OBJDIR #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 */ /* Name of package */
#undef PACKAGE #undef PACKAGE

34
config.h.win32
View File

@@ -8,35 +8,43 @@
/* Define to 1 if you have the declaration of `INFINITY', and to 0 if you /* Define to 1 if you have the declaration of `INFINITY', and to 0 if you
don't. */ don't. */
#if defined(_MSC_VER) && _MSC_VER >= 1800
#define HAVE_DECL_INFINITY 1 #define HAVE_DECL_INFINITY 1
#endif
/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't. /* 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 #define HAVE_DECL_ISINF 1
#endif
/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't. /* 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 #define HAVE_DECL_ISNAN 1
#endif
/* Define to 1 if you have the declaration of `nan', and to 0 if you don't. */ /* 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 #define HAVE_DECL_NAN 1
#endif
/* Define to 1 if you have the declaration of `_finite', and to 0 if you /* Define to 1 if you have the declaration of `_finite', and to 0 if you
don't. */ 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 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 <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H #define HAVE_DLFCN_H 1
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ /* 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 <endian.h> header file. */ /* Define to 1 if you have the <endian.h> header file. */
#define HAVE_ENDIAN_H 1 #undef HAVE_ENDIAN_H
/* Define to 1 if you have the <fcntl.h> header file. */ /* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1 #define HAVE_FCNTL_H 1
@@ -58,7 +66,7 @@
#define HAVE_MEMORY_H 1 #define HAVE_MEMORY_H 1
/* Define to 1 if you have the `open' function. */ /* 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, /* Define to 1 if your system has a GNU libc compatible `realloc' function,
and to 0 otherwise. */ and to 0 otherwise. */
@@ -95,13 +103,13 @@
#define HAVE_STRING_H 1 #define HAVE_STRING_H 1
/* Define to 1 if you have the `strncasecmp' function. */ /* Define to 1 if you have the `strncasecmp' function. */
#define HAVE_STRNCASECMP 1 #undef HAVE_STRNCASECMP
/* Define to 1 if you have the <syslog.h> header file. */ /* Define to 1 if you have the <syslog.h> header file. */
#undef HAVE_SYSLOG_H #undef HAVE_SYSLOG_H
/* Define to 1 if you have the <sys/cdefs.h> header file. */ /* Define to 1 if you have the <sys/cdefs.h> header file. */
#undef HAVE_SYS_CDEFS_H #define HAVE_SYS_CDEFS_H 1
/* Define to 1 if you have the <sys/param.h> header file. */ /* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H #undef HAVE_SYS_PARAM_H
@@ -119,21 +127,21 @@
#undef HAVE_VASPRINTF #undef HAVE_VASPRINTF
/* Define to 1 if you have the `vprintf' function. */ /* 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. */ /* 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. */ /* Define to 1 if you have the `vsyslog' function. */
#undef HAVE_VSYSLOG #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. /* Define to the sub-directory in which libtool stores uninstalled libraries.
*/ */
#undef LT_OBJDIR #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 */ /* Name of package */
#define PACKAGE "json-c" #define PACKAGE "json-c"

111
json-c.vcxproj
View File

@@ -1,26 +1,44 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{04D8CDBE-FB3E-4362-87E6-07DC3C0083B2}</ProjectGuid> <ProjectGuid>{04D8CDBE-FB3E-4362-87E6-07DC3C0083B2}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <RootNamespace>jsonc</RootNamespace>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset> <PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset> <PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
@@ -28,60 +46,88 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>12.0.30324.0</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>Debug\</OutDir>
<IntDir>Debug\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>Release\</OutDir>
<IntDir>Release\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile> </ClCompile>
<Lib>
<OutputFile>$(OutDir)json-c.lib</OutputFile>
</Lib>
<PreBuildEvent> <PreBuildEvent>
<Command>copy config.h.win32 config.h <Command>copy config.h.win32 config.h
copy json_config.h.win32 json_config.h copy json_config.h.win32 json_config.h
</Command> </Command>
</PreBuildEvent> </PreBuildEvent>
<PreBuildEvent>
<Message>copy config.h from Windows template instead of calling configure</Message>
</PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Optimization>Disabled</Optimization>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader /> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile> </ClCompile>
<Lib>
<OutputFile>$(OutDir)json-c.lib</OutputFile>
</Lib>
<PreBuildEvent> <PreBuildEvent>
<Command>copy config.h.win32 config.h <Command>copy config.h.win32 config.h
copy json_config.h.win32 json_config.h copy json_config.h.win32 json_config.h
</Command> </Command>
</PreBuildEvent> </PreBuildEvent>
<PreBuildEvent>
<Message>copy config.h from Windows template instead of calling configure</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<PreBuildEvent>
<Command>copy config.h.win32 config.h
copy json_config.h.win32 json_config.h
</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>copy config.h from Windows template instead of calling configure</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<PreBuildEvent>
<Command>copy config.h.win32 config.h
copy json_config.h.win32 json_config.h
</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>copy config.h from Windows template instead of calling configure</Message>
</PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="arraylist.c" /> <ClCompile Include="arraylist.c" />
@@ -91,17 +137,20 @@ copy json_config.h.win32 json_config.h
<ClCompile Include="json_util.c" /> <ClCompile Include="json_util.c" />
<ClCompile Include="linkhash.c" /> <ClCompile Include="linkhash.c" />
<ClCompile Include="printbuf.c" /> <ClCompile Include="printbuf.c" />
<ClCompile Include="random_seed.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="arraylist.h" /> <ClInclude Include="arraylist.h" />
<ClInclude Include="bits.h" />
<ClInclude Include="debug.h" /> <ClInclude Include="debug.h" />
<ClInclude Include="json_inttypes.h" />
<ClInclude Include="json_object.h" /> <ClInclude Include="json_object.h" />
<ClInclude Include="json_object_private.h" /> <ClInclude Include="json_object_private.h" />
<ClInclude Include="json_tokener.h" /> <ClInclude Include="json_tokener.h" />
<ClInclude Include="json_util.h" /> <ClInclude Include="json_util.h" />
<ClInclude Include="linkhash.h" /> <ClInclude Include="linkhash.h" />
<ClInclude Include="math_compat.h" />
<ClInclude Include="printbuf.h" /> <ClInclude Include="printbuf.h" />
<ClInclude Include="random_seed.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="config.h.win32" /> <None Include="config.h.win32" />

21
json-c.vcxproj.filters
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
@@ -14,7 +14,7 @@
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions> <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
</Filter> </Filter>
<Filter Include="Documentation"> <Filter Include="Documentation">
<UniqueIdentifier>{d3849076-874e-490e-858c-0871d04d1ecb}</UniqueIdentifier> <UniqueIdentifier>{8c5a59ed-4639-4361-9b7c-ecdcd09b953c}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -39,14 +39,14 @@
<ClCompile Include="printbuf.c"> <ClCompile Include="printbuf.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="random_seed.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="arraylist.h"> <ClInclude Include="arraylist.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="bits.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="debug.h"> <ClInclude Include="debug.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@@ -68,14 +68,23 @@
<ClInclude Include="printbuf.h"> <ClInclude Include="printbuf.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="json_inttypes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="math_compat.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="random_seed.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Doxyfile"> <None Include="Doxyfile">
<Filter>Documentation</Filter> <Filter>Documentation</Filter>
</None> </None>
<None Include="config.h.win32" /> <None Include="config.h.win32" />
<None Include="json_config.h.win32" />
<None Include="README-WIN32.html" /> <None Include="README-WIN32.html" />
<None Include="README.html" /> <None Include="README.html" />
<None Include="json_config.h.win32" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
json_config.h.win32
View File

@@ -1,3 +1,5 @@
/* Define to 1 if you have the <inttypes.h> header file. */ /* 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 #define JSON_C_HAVE_INTTYPES_H 1
#endif

21
json_inttypes.h
View File

@@ -4,25 +4,16 @@
#include "json_config.h" #include "json_config.h"
#if defined(_MSC_VER) && _MSC_VER <= 1700 #ifdef JSON_C_HAVE_INTTYPES_H
/* inttypes.h includes stdint.h */
#include <inttypes.h>
#else
#include <stdint.h>
/* Anything less than Visual Studio C++ 10 is missing stdint.h and inttypes.h */
typedef __int32 int32_t;
#define INT32_MIN ((int32_t)_I32_MIN)
#define INT32_MAX ((int32_t)_I32_MAX)
typedef __int64 int64_t;
#define INT64_MIN ((int64_t)_I64_MIN)
#define INT64_MAX ((int64_t)_I64_MAX)
#define PRId64 "I64d" #define PRId64 "I64d"
#define SCNd64 "I64d" #define SCNd64 "I64d"
#else
#ifdef JSON_C_HAVE_INTTYPES_H
#include <inttypes.h>
#endif
/* inttypes.h includes stdint.h */
#endif #endif
#endif #endif

6
json_object.c
View File

@@ -409,7 +409,7 @@ void json_object_object_add(struct json_object* jso, const char *key,
lh_table_insert(jso->o.c_object, strdup(key), val); lh_table_insert(jso->o.c_object, strdup(key), val);
return; return;
} }
existing_value = (void *)existing_entry->v; existing_value = (json_object *)existing_entry->v;
if (existing_value) if (existing_value)
json_object_put(existing_value); json_object_put(existing_value);
existing_entry->v = val; existing_entry->v = val;
@@ -661,8 +661,8 @@ struct json_object* json_object_new_double_s(double d, const char *ds)
int json_object_userdata_to_json_string(struct json_object *jso, int json_object_userdata_to_json_string(struct json_object *jso,
struct printbuf *pb, int level, int flags) struct printbuf *pb, int level, int flags)
{ {
int userdata_len = strlen(jso->_userdata); int userdata_len = strlen((const char *)jso->_userdata);
printbuf_memappend(pb, jso->_userdata, userdata_len); printbuf_memappend(pb, (const char *)jso->_userdata, userdata_len);
return userdata_len; return userdata_len;
} }

3
json_tokener.c
View File

@@ -16,6 +16,7 @@
#include "config.h" #include "config.h"
#include <math.h> #include <math.h>
#include "math_compat.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
@@ -353,7 +354,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
case json_tokener_state_inf: /* aka starts with 'i' */ case json_tokener_state_inf: /* aka starts with 'i' */
{ {
int size_inf; size_t size_inf;
int is_negative = 0; int is_negative = 0;
printbuf_memappend_fast(tok->pb, &c, 1); printbuf_memappend_fast(tok->pb, &c, 1);

4
linkhash.c
View File

@@ -10,6 +10,8 @@
* *
*/ */
#include "config.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@@ -413,7 +415,7 @@ unsigned long lh_char_hash(const void *k)
#if defined __GNUC__ #if defined __GNUC__
__sync_val_compare_and_swap(&random_seed, -1, seed); __sync_val_compare_and_swap(&random_seed, -1, seed);
#elif defined _MSC_VER #elif defined _MSC_VER
InterlockedCompareExchange(&random_seed, seed, -1); InterlockedCompareExchange((LONG *)&random_seed, seed, -1);
#else #else
#warning "racy random seed initializtion if used by multiple threads" #warning "racy random seed initializtion if used by multiple threads"
random_seed = seed; /* potentially racy */ random_seed = seed; /* potentially racy */

15
math_compat.h
View File

@@ -1,7 +1,7 @@
#ifndef __math_compat_h #ifndef __math_compat_h
#define __math_compat_h #define __math_compat_h
/* Define isnan and isinf on Windows/MSVC */ /* Define isnan, isinf, infinity and nan on Windows/MSVC */
#ifndef HAVE_DECL_ISNAN #ifndef HAVE_DECL_ISNAN
# ifdef HAVE_DECL__ISNAN # ifdef HAVE_DECL__ISNAN
@@ -17,12 +17,15 @@
# endif # endif
#endif #endif
#ifndef HAVE_DECL_NAN
#error This platform does not have nan()
#endif
#ifndef HAVE_DECL_INFINITY #ifndef HAVE_DECL_INFINITY
#error This platform does not have INFINITY #include <float.h>
#define INFINITY (DBL_MAX + DBL_MAX)
#define HAVE_DECL_INFINITY
#endif
#ifndef HAVE_DECL_NAN
#define NAN (INFINITY - INFINITY)
#define HAVE_DECL_NAN
#endif #endif
#endif #endif

1
random_seed.c
View File

@@ -11,6 +11,7 @@
#include <stdio.h> #include <stdio.h>
#include "config.h" #include "config.h"
#include "random_seed.h"
#define DEBUG_SEED(s) #define DEBUG_SEED(s)