fixed VS project

This commit is contained in:
Yann Collet
2016-01-21 16:04:35 +01:00
parent ffec740d37
commit a768a301ba
6 changed files with 80 additions and 84 deletions
+1 -1
View File
@@ -81,7 +81,7 @@ ERR_STATIC unsigned ERR_isError(size_t code) { return (code > ERROR(maxCode)); }
ERR_STATIC const char* ERR_getErrorName(size_t code) ERR_STATIC const char* ERR_getErrorName(size_t code)
{ {
static const char* codeError = "Unspecified error code"; static const char* codeError = "Unspecified error code";
switch( (size_t)-code ) switch( (size_t)(0-code) )
{ {
case ZSTD_error_No_Error: return "No error detected"; case ZSTD_error_No_Error: return "No error detected";
case ZSTD_error_GENERIC: return "Error (generic)"; case ZSTD_error_GENERIC: return "Error (generic)";
+2 -1
View File
@@ -59,7 +59,8 @@ enum {
ZSTD_error_maxCode ZSTD_error_maxCode
}; };
/* note : functions provide error codes are provided as (size_t)-enum */ /* note : functions provide error codes in reverse negative order,
so compare with (size_t)(0-enum) */
#if defined (__cplusplus) #if defined (__cplusplus)
-1
View File
@@ -39,7 +39,6 @@
# define FORCE_INLINE static __forceinline # define FORCE_INLINE static __forceinline
# include <intrin.h> /* For Visual 2005 */ # include <intrin.h> /* For Visual 2005 */
# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ # pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */
# pragma warning(disable : 4324) /* disable: C4324: padded structure */
#else #else
# define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) # define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
# ifdef __GNUC__ # ifdef __GNUC__
+1 -1
View File
@@ -799,7 +799,7 @@ size_t ZSTD_decompress(void* dst, size_t maxDstSize, const void* src, size_t src
#else #else
ZSTD_DCtx dctx; ZSTD_DCtx dctx;
return ZSTD_decompressDCtx(&dctx, dst, maxDstSize, src, srcSize); return ZSTD_decompressDCtx(&dctx, dst, maxDstSize, src, srcSize);
#endif // defined #endif
} }
-1
View File
@@ -27,7 +27,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\lib\bitstream.h" /> <ClInclude Include="..\..\..\lib\bitstream.h" />
<ClInclude Include="..\..\..\lib\error.h" />
<ClInclude Include="..\..\..\lib\fse.h" /> <ClInclude Include="..\..\..\lib\fse.h" />
<ClInclude Include="..\..\..\lib\fse_static.h" /> <ClInclude Include="..\..\..\lib\fse_static.h" />
<ClInclude Include="..\..\..\lib\huff0.h" /> <ClInclude Include="..\..\..\lib\huff0.h" />
@@ -53,9 +53,6 @@
<ClInclude Include="resource.h"> <ClInclude Include="resource.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\lib\error.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\lib\bitstream.h"> <ClInclude Include="..\..\..\lib\bitstream.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>