diff options
-rw-r--r-- | xdelta3/xdelta3-main.h | 2 | ||||
-rw-r--r-- | xdelta3/xdelta3.h | 5 | ||||
-rwxr-xr-x | xdelta3/xdelta3.vcxproj | 13 |
3 files changed, 16 insertions, 4 deletions
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h index 5b4e34b..7f1e589 100644 --- a/xdelta3/xdelta3-main.h +++ b/xdelta3/xdelta3-main.h | |||
@@ -382,6 +382,7 @@ main_config (void) | |||
382 | XPR(NTR "sizeof(int)=%d\n", (int)sizeof(int)); | 382 | XPR(NTR "sizeof(int)=%d\n", (int)sizeof(int)); |
383 | XPR(NTR "sizeof(long)=%d\n", (int)sizeof(long)); | 383 | XPR(NTR "sizeof(long)=%d\n", (int)sizeof(long)); |
384 | XPR(NTR "sizeof(long long)=%d\n", (int)sizeof(long long)); | 384 | XPR(NTR "sizeof(long long)=%d\n", (int)sizeof(long long)); |
385 | XPR(NTR "sizeof(unsigned long long)=%d\n", (int)sizeof(unsigned long long)); | ||
385 | XPR(NTR "sizeof(size_t)=%d\n", (int)sizeof(size_t)); | 386 | XPR(NTR "sizeof(size_t)=%d\n", (int)sizeof(size_t)); |
386 | XPR(NTR "sizeof(uint32_t)=%d\n", (int)sizeof(uint32_t)); | 387 | XPR(NTR "sizeof(uint32_t)=%d\n", (int)sizeof(uint32_t)); |
387 | XPR(NTR "sizeof(uint64_t)=%d\n", (int)sizeof(uint64_t)); | 388 | XPR(NTR "sizeof(uint64_t)=%d\n", (int)sizeof(uint64_t)); |
@@ -672,6 +673,7 @@ main_strtoxoff (const char* s, xoff_t *xo, char which) | |||
672 | unsigned long long bad = ULONG_MAX; | 673 | unsigned long long bad = ULONG_MAX; |
673 | #else | 674 | #else |
674 | /* Something wrong with SIZEOF_XOFF_T, SIZEOF_UNSIGNED_LONG, etc. */ | 675 | /* Something wrong with SIZEOF_XOFF_T, SIZEOF_UNSIGNED_LONG, etc. */ |
676 | #error Bad configure script | ||
675 | #endif | 677 | #endif |
676 | 678 | ||
677 | if (xx == bad) | 679 | if (xx == bad) |
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h index f98eb2a..b9b6fe0 100644 --- a/xdelta3/xdelta3.h +++ b/xdelta3/xdelta3.h | |||
@@ -136,6 +136,7 @@ | |||
136 | /* _MSV_VER is defined by Microsoft tools, not by Mingw32 */ | 136 | /* _MSV_VER is defined by Microsoft tools, not by Mingw32 */ |
137 | #ifdef _MSC_VER | 137 | #ifdef _MSC_VER |
138 | typedef signed int ssize_t; | 138 | typedef signed int ssize_t; |
139 | typedef int pid_t; | ||
139 | #if _MSC_VER < 1600 | 140 | #if _MSC_VER < 1600 |
140 | typedef unsigned char uint8_t; | 141 | typedef unsigned char uint8_t; |
141 | typedef unsigned short uint16_t; | 142 | typedef unsigned short uint16_t; |
@@ -144,6 +145,7 @@ typedef ULONGLONG uint64_t; | |||
144 | #else /* _MSC_VER >= 1600 */ | 145 | #else /* _MSC_VER >= 1600 */ |
145 | /* For MSVC10 and above */ | 146 | /* For MSVC10 and above */ |
146 | #include <stdint.h> | 147 | #include <stdint.h> |
148 | #define inline __inline | ||
147 | #endif /* _MSC_VER < 1600 */ | 149 | #endif /* _MSC_VER < 1600 */ |
148 | #else /* _MSC_VER not defined */ | 150 | #else /* _MSC_VER not defined */ |
149 | /* Mingw32 */ | 151 | /* Mingw32 */ |
@@ -165,6 +167,9 @@ typedef ULONGLONG uint64_t; | |||
165 | #define _FILE_OFFSET_BITS 64 | 167 | #define _FILE_OFFSET_BITS 64 |
166 | #endif | 168 | #endif |
167 | 169 | ||
170 | static_assert(SIZEOF_SIZE_T == sizeof(size_t), "SIZEOF_SIZE_T not correctly set"); | ||
171 | static_assert(SIZEOF_UNSIGNED_LONG_LONG == sizeof(unsigned long long), "SIZEOF_UNSIGNED_LONG_LONG not correctly set"); | ||
172 | |||
168 | /* Set a xoff_t typedef and the "Q" printf insert. */ | 173 | /* Set a xoff_t typedef and the "Q" printf insert. */ |
169 | #if defined(_WIN32) | 174 | #if defined(_WIN32) |
170 | typedef uint64_t xoff_t; | 175 | typedef uint64_t xoff_t; |
diff --git a/xdelta3/xdelta3.vcxproj b/xdelta3/xdelta3.vcxproj index 1bff06b..31f97f8 100755 --- a/xdelta3/xdelta3.vcxproj +++ b/xdelta3/xdelta3.vcxproj | |||
@@ -1,5 +1,5 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
3 | <ItemGroup Label="ProjectConfigurations"> | 3 | <ItemGroup Label="ProjectConfigurations"> |
4 | <ProjectConfiguration Include="Debug|Itanium"> | 4 | <ProjectConfiguration Include="Debug|Itanium"> |
5 | <Configuration>Debug</Configuration> | 5 | <Configuration>Debug</Configuration> |
@@ -77,6 +77,7 @@ | |||
77 | <ConfigurationType>Application</ConfigurationType> | 77 | <ConfigurationType>Application</ConfigurationType> |
78 | <UseDebugLibraries>true</UseDebugLibraries> | 78 | <UseDebugLibraries>true</UseDebugLibraries> |
79 | <CharacterSet>MultiByte</CharacterSet> | 79 | <CharacterSet>MultiByte</CharacterSet> |
80 | <PlatformToolset>v120</PlatformToolset> | ||
80 | </PropertyGroup> | 81 | </PropertyGroup> |
81 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration"> | 82 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration"> |
82 | <ConfigurationType>Application</ConfigurationType> | 83 | <ConfigurationType>Application</ConfigurationType> |
@@ -87,12 +88,14 @@ | |||
87 | <ConfigurationType>Application</ConfigurationType> | 88 | <ConfigurationType>Application</ConfigurationType> |
88 | <UseDebugLibraries>true</UseDebugLibraries> | 89 | <UseDebugLibraries>true</UseDebugLibraries> |
89 | <CharacterSet>MultiByte</CharacterSet> | 90 | <CharacterSet>MultiByte</CharacterSet> |
91 | <PlatformToolset>v120</PlatformToolset> | ||
90 | </PropertyGroup> | 92 | </PropertyGroup> |
91 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | 93 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
92 | <ConfigurationType>Application</ConfigurationType> | 94 | <ConfigurationType>Application</ConfigurationType> |
93 | <UseDebugLibraries>false</UseDebugLibraries> | 95 | <UseDebugLibraries>false</UseDebugLibraries> |
94 | <WholeProgramOptimization>true</WholeProgramOptimization> | 96 | <WholeProgramOptimization>true</WholeProgramOptimization> |
95 | <CharacterSet>MultiByte</CharacterSet> | 97 | <CharacterSet>MultiByte</CharacterSet> |
98 | <PlatformToolset>v120</PlatformToolset> | ||
96 | </PropertyGroup> | 99 | </PropertyGroup> |
97 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration"> | 100 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration"> |
98 | <ConfigurationType>Application</ConfigurationType> | 101 | <ConfigurationType>Application</ConfigurationType> |
@@ -105,13 +108,14 @@ | |||
105 | <UseDebugLibraries>false</UseDebugLibraries> | 108 | <UseDebugLibraries>false</UseDebugLibraries> |
106 | <WholeProgramOptimization>true</WholeProgramOptimization> | 109 | <WholeProgramOptimization>true</WholeProgramOptimization> |
107 | <CharacterSet>MultiByte</CharacterSet> | 110 | <CharacterSet>MultiByte</CharacterSet> |
108 | <PlatformToolset>Windows7.1SDK</PlatformToolset> | 111 | <PlatformToolset>v120</PlatformToolset> |
109 | </PropertyGroup> | 112 | </PropertyGroup> |
110 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='xdelta3-64|Win32'" Label="Configuration"> | 113 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='xdelta3-64|Win32'" Label="Configuration"> |
111 | <ConfigurationType>Application</ConfigurationType> | 114 | <ConfigurationType>Application</ConfigurationType> |
112 | <UseDebugLibraries>false</UseDebugLibraries> | 115 | <UseDebugLibraries>false</UseDebugLibraries> |
113 | <WholeProgramOptimization>true</WholeProgramOptimization> | 116 | <WholeProgramOptimization>true</WholeProgramOptimization> |
114 | <CharacterSet>MultiByte</CharacterSet> | 117 | <CharacterSet>MultiByte</CharacterSet> |
118 | <PlatformToolset>v120</PlatformToolset> | ||
115 | </PropertyGroup> | 119 | </PropertyGroup> |
116 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='xdelta3-64|Itanium'" Label="Configuration"> | 120 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='xdelta3-64|Itanium'" Label="Configuration"> |
117 | <ConfigurationType>Application</ConfigurationType> | 121 | <ConfigurationType>Application</ConfigurationType> |
@@ -124,6 +128,7 @@ | |||
124 | <UseDebugLibraries>false</UseDebugLibraries> | 128 | <UseDebugLibraries>false</UseDebugLibraries> |
125 | <WholeProgramOptimization>true</WholeProgramOptimization> | 129 | <WholeProgramOptimization>true</WholeProgramOptimization> |
126 | <CharacterSet>MultiByte</CharacterSet> | 130 | <CharacterSet>MultiByte</CharacterSet> |
131 | <PlatformToolset>v120</PlatformToolset> | ||
127 | </PropertyGroup> | 132 | </PropertyGroup> |
128 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 133 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
129 | <ImportGroup Label="ExtensionSettings"> | 134 | <ImportGroup Label="ExtensionSettings"> |
@@ -190,14 +195,14 @@ | |||
190 | <PrecompiledHeader>NotUsing</PrecompiledHeader> | 195 | <PrecompiledHeader>NotUsing</PrecompiledHeader> |
191 | <WarningLevel>Level3</WarningLevel> | 196 | <WarningLevel>Level3</WarningLevel> |
192 | <Optimization>Disabled</Optimization> | 197 | <Optimization>Disabled</Optimization> |
193 | <PreprocessorDefinitions>WIN32;XD3_MAIN=1;XD3_DEBUG=0;XD3_USE_LARGEFILE64=1;REGRESSION_TEST=1;SECONDARY_DJW=1;SECONDARY_FGK=1;XD3_WIN32=1;EXTERNAL_COMPRESSION=0;SHELL_TESTS=0;_DEBUG;_CONSOLE;SECONDARY_LZMA=1;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 198 | <PreprocessorDefinitions>WIN32;XD3_MAIN=1;XD3_DEBUG=0;XD3_USE_LARGEFILE64=1;REGRESSION_TEST=1;SECONDARY_DJW=1;SECONDARY_FGK=1;XD3_WIN32=1;EXTERNAL_COMPRESSION=0;SHELL_TESTS=0;_DEBUG;_CONSOLE;SECONDARY_LZMA=0;LZMA_API_STATIC;SIZEOF_SIZE_T=4;SIZEOF_UNSIGNED_LONG_LONG=8;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
194 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | 199 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
195 | <AdditionalIncludeDirectories>../xz/include</AdditionalIncludeDirectories> | 200 | <AdditionalIncludeDirectories>../xz/include</AdditionalIncludeDirectories> |
196 | </ClCompile> | 201 | </ClCompile> |
197 | <Link> | 202 | <Link> |
198 | <SubSystem>Console</SubSystem> | 203 | <SubSystem>Console</SubSystem> |
199 | <GenerateDebugInformation>true</GenerateDebugInformation> | 204 | <GenerateDebugInformation>true</GenerateDebugInformation> |
200 | <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;..\..\..\..\src\xz\bin_i486\liblzma_static.lib;%(AdditionalDependencies)</AdditionalDependencies> | 205 | <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
201 | </Link> | 206 | </Link> |
202 | </ItemDefinitionGroup> | 207 | </ItemDefinitionGroup> |
203 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | 208 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> |