| diff --git a/src/c/include/winconfig.h b/src/c/include/winconfig.h |
| index ccc3c189..a4b3287a 100644 |
| --- a/src/c/include/winconfig.h |
| +++ b/src/c/include/winconfig.h |
| @@ -1,3 +1,5 @@ |
| +#pragma once |
| + |
| /* Define to 1 if you have the <arpa/inet.h> header file. */ |
| #undef HAVE_ARPA_INET_H |
| |
| @@ -152,13 +154,6 @@ |
| #define __attribute__(x) |
| #define __func__ __FUNCTION__ |
| |
| -#ifndef _WIN32_WINNT_NT4 |
| -#define _WIN32_WINNT_NT4 0x0400 |
| -#endif |
| - |
| -#define NTDDI_VERSION _WIN32_WINNT_NT4 |
| -#define _WIN32_WINNT _WIN32_WINNT_NT4 |
| - |
| #define _CRT_SECURE_NO_WARNINGS |
| #define WIN32_LEAN_AND_MEAN |
| #include <Windows.h> |
| @@ -171,12 +166,17 @@ |
| #undef max |
| |
| #include <errno.h> |
| +#include <stdlib.h> |
| |
| #define strtok_r strtok_s |
| #define localtime_r(a,b) localtime_s(b,a) |
| #define get_errno() errno=GetLastError() |
| -#define random rand |
| + |
| +inline int __cdecl random() { return rand(); } |
| + |
| +#if ((defined(_MSC_VER) && _MSC_VER < 1900) || !defined(_MSC_VER)) |
| #define snprintf _snprintf |
| +#endif |
| |
| #define ACL ZKACL // Conflict with windows API |
| |
| @@ -192,5 +192,5 @@ |
| #define EINPROGRESS WSAEINPROGRESS |
| #endif |
| |
| -typedef int pid_t; |
| +typedef DWORD pid_t; |
| #endif |
| diff --git a/src/c/include/winstdint.h b/src/c/include/winstdint.h |
| index d02608a5..196ecc5d 100644 |
| --- a/src/c/include/winstdint.h |
| +++ b/src/c/include/winstdint.h |
| @@ -41,6 +41,7 @@ |
| #endif |
| |
| #include <limits.h> |
| +#include <stdint.h> |
| |
| // For Visual Studio 6 in C++ mode and for many Visual Studio versions when |
| // compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}' |
| @@ -100,16 +101,6 @@ typedef uint16_t uint_least16_t; |
| typedef uint32_t uint_least32_t; |
| typedef uint64_t uint_least64_t; |
| |
| -// 7.18.1.3 Fastest minimum-width integer types |
| -typedef int8_t int_fast8_t; |
| -typedef int16_t int_fast16_t; |
| -typedef int32_t int_fast32_t; |
| -typedef int64_t int_fast64_t; |
| -typedef uint8_t uint_fast8_t; |
| -typedef uint16_t uint_fast16_t; |
| -typedef uint32_t uint_fast32_t; |
| -typedef uint64_t uint_fast64_t; |
| - |
| // 7.18.1.4 Integer types capable of holding object pointers |
| #ifdef _WIN64 // [ |
| typedef signed __int64 intptr_t; |
| @@ -126,7 +117,7 @@ typedef uint64_t uintmax_t; |
| |
| // 7.18.2 Limits of specified-width integer types |
| |
| -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259 |
| +#if (_MSC_VER < 1900) && (!defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)) // [ See footnote 220 at page 257 and footnote 221 at page 259 |
| |
| // 7.18.2.1 Limits of exact-width integer types |
| #define INT8_MIN ((int8_t)_I8_MIN) |
| @@ -223,7 +214,7 @@ typedef uint64_t uintmax_t; |
| |
| // 7.18.4 Limits of other integer types |
| |
| -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260 |
| +#if (_MSC_VER < 1900) && (!defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)) // [ See footnote 224 at page 260 |
| |
| // 7.18.4.1 Macros for minimum-width integer constants |
| |
| diff --git a/src/c/zookeeper-vs2015.sln b/src/c/zookeeper-vs2015.sln |
| new file mode 100644 |
| index 00000000..44d738f8 |
| --- /dev/null |
| +++ b/src/c/zookeeper-vs2015.sln |
| @@ -0,0 +1,37 @@ |
| +Microsoft Visual Studio Solution File, Format Version 12.00 |
| +# Visual Studio 14 |
| +VisualStudioVersion = 14.0.23107.0 |
| +MinimumVisualStudioVersion = 10.0.40219.1 |
| +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zookeeper", "zookeeper.vcxproj", "{5754FB2B-5EA5-4988-851D-908CA533A626}" |
| +EndProject |
| +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cli", "cli.vcxproj", "{F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}" |
| +EndProject |
| +Global |
| + GlobalSection(SolutionConfigurationPlatforms) = preSolution |
| + Debug|Win32 = Debug|Win32 |
| + Debug|x64 = Debug|x64 |
| + Release|Win32 = Release|Win32 |
| + Release|x64 = Release|x64 |
| + EndGlobalSection |
| + GlobalSection(ProjectConfigurationPlatforms) = postSolution |
| + {5754FB2B-5EA5-4988-851D-908CA533A626}.Debug|Win32.ActiveCfg = Debug|Win32 |
| + {5754FB2B-5EA5-4988-851D-908CA533A626}.Debug|Win32.Build.0 = Debug|Win32 |
| + {5754FB2B-5EA5-4988-851D-908CA533A626}.Debug|x64.ActiveCfg = Debug|x64 |
| + {5754FB2B-5EA5-4988-851D-908CA533A626}.Debug|x64.Build.0 = Debug|x64 |
| + {5754FB2B-5EA5-4988-851D-908CA533A626}.Release|Win32.ActiveCfg = Release|Win32 |
| + {5754FB2B-5EA5-4988-851D-908CA533A626}.Release|Win32.Build.0 = Release|Win32 |
| + {5754FB2B-5EA5-4988-851D-908CA533A626}.Release|x64.ActiveCfg = Release|x64 |
| + {5754FB2B-5EA5-4988-851D-908CA533A626}.Release|x64.Build.0 = Release|x64 |
| + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Debug|Win32.ActiveCfg = Debug|Win32 |
| + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Debug|Win32.Build.0 = Debug|Win32 |
| + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Debug|x64.ActiveCfg = Debug|x64 |
| + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Debug|x64.Build.0 = Debug|x64 |
| + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Release|Win32.ActiveCfg = Release|Win32 |
| + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Release|Win32.Build.0 = Release|Win32 |
| + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Release|x64.ActiveCfg = Release|x64 |
| + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Release|x64.Build.0 = Release|x64 |
| + EndGlobalSection |
| + GlobalSection(SolutionProperties) = preSolution |
| + HideSolutionNode = FALSE |
| + EndGlobalSection |
| +EndGlobal |
| diff --git a/src/c/zookeeper.vcxproj b/src/c/zookeeper.vcxproj |
| index be4ad9ab..5e75f779 100644 |
| --- a/src/c/zookeeper.vcxproj |
| +++ b/src/c/zookeeper.vcxproj |
| @@ -1,5 +1,5 @@ |
| <?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="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| <ItemGroup Label="ProjectConfigurations"> |
| <ProjectConfiguration Include="Debug|Win32"> |
| <Configuration>Debug</Configuration> |
| @@ -22,24 +22,25 @@ |
| <ProjectGuid>{5754FB2B-5EA5-4988-851D-908CA533A626}</ProjectGuid> |
| <RootNamespace>zookeeper</RootNamespace> |
| <Keyword>Win32Proj</Keyword> |
| + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> |
| </PropertyGroup> |
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
| - <ConfigurationType>DynamicLibrary</ConfigurationType> |
| - <PlatformToolset>v120</PlatformToolset> |
| + <ConfigurationType>StaticLibrary</ConfigurationType> |
| + <PlatformToolset>v140</PlatformToolset> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
| - <ConfigurationType>DynamicLibrary</ConfigurationType> |
| - <PlatformToolset>v120</PlatformToolset> |
| + <ConfigurationType>StaticLibrary</ConfigurationType> |
| + <PlatformToolset>v140</PlatformToolset> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| - <ConfigurationType>DynamicLibrary</ConfigurationType> |
| - <PlatformToolset>v120</PlatformToolset> |
| + <ConfigurationType>StaticLibrary</ConfigurationType> |
| + <PlatformToolset>v140</PlatformToolset> |
| <CharacterSet>MultiByte</CharacterSet> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
| - <ConfigurationType>DynamicLibrary</ConfigurationType> |
| - <PlatformToolset>v120</PlatformToolset> |
| + <ConfigurationType>StaticLibrary</ConfigurationType> |
| + <PlatformToolset>v140</PlatformToolset> |
| <CharacterSet>MultiByte</CharacterSet> |
| </PropertyGroup> |
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| @@ -80,10 +81,10 @@ |
| <ClCompile> |
| <Optimization>Disabled</Optimization> |
| <AdditionalIncludeDirectories>./include;./generated;./hashtable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;THREADED;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <MinimalRebuild>true</MinimalRebuild> |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
| - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
| + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| <PrecompiledHeader /> |
| <WarningLevel>Level3</WarningLevel> |
| <DebugInformationFormat>EditAndContinue</DebugInformationFormat> |
| @@ -104,7 +105,7 @@ |
| <AdditionalIncludeDirectories>./include;./generated;./hashtable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
| - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
| + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| <PrecompiledHeader> |
| </PrecompiledHeader> |
| <WarningLevel>Level3</WarningLevel> |
| @@ -124,7 +125,7 @@ |
| <ClCompile> |
| <AdditionalIncludeDirectories>./include;./generated;./hashtable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
| + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
| <PrecompiledHeader /> |
| <WarningLevel>Level3</WarningLevel> |
| <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
