From: Nick Terrell Date: Mon, 3 Apr 2017 23:08:20 +0000 (-0700) Subject: Fix compilation errors X-Git-Tag: v1.2.0^2~58^2~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87cec8fd56b01147ea229482b1e492985e050dab;p=thirdparty%2Fzstd.git Fix compilation errors --- diff --git a/contrib/linux-kernel/lib/entropy_common.c b/contrib/linux-kernel/lib/entropy_common.c index f6a43662d..68d880827 100644 --- a/contrib/linux-kernel/lib/entropy_common.c +++ b/contrib/linux-kernel/lib/entropy_common.c @@ -47,10 +47,8 @@ unsigned FSE_versionNumber(void) { return FSE_VERSION_NUMBER; } /*=== Error Management ===*/ unsigned FSE_isError(size_t code) { return ERR_isError(code); } -const char* FSE_getErrorName(size_t code) { return ERR_getErrorName(code); } unsigned HUF_isError(size_t code) { return ERR_isError(code); } -const char* HUF_getErrorName(size_t code) { return ERR_getErrorName(code); } /*-************************************************************** diff --git a/contrib/linux-kernel/lib/error_private.h b/contrib/linux-kernel/lib/error_private.h index 680eba112..9bfbe4b5c 100644 --- a/contrib/linux-kernel/lib/error_private.h +++ b/contrib/linux-kernel/lib/error_private.h @@ -41,16 +41,4 @@ ERR_STATIC unsigned ERR_isError(size_t code) { return (code > ERROR(maxCode)); } ERR_STATIC ERR_enum ERR_getErrorCode(size_t code) { if (!ERR_isError(code)) return (ERR_enum)0; return (ERR_enum) (0-code); } - -/*-**************************************** -* Error Strings -******************************************/ - -const char* ERR_getErrorString(ERR_enum code); /* error_private.c */ - -ERR_STATIC const char* ERR_getErrorName(size_t code) -{ - return ERR_getErrorString(ERR_getErrorCode(code)); -} - #endif /* ERROR_H_MODULE */ diff --git a/contrib/linux-kernel/lib/fse.h b/contrib/linux-kernel/lib/fse.h index 6df7ff935..fbd97fae3 100644 --- a/contrib/linux-kernel/lib/fse.h +++ b/contrib/linux-kernel/lib/fse.h @@ -66,7 +66,6 @@ FSE_PUBLIC_API size_t FSE_compressBound(size_t size); /* maximum compresse /* Error Management */ FSE_PUBLIC_API unsigned FSE_isError(size_t code); /* tells if a return value is an error code */ -FSE_PUBLIC_API const char* FSE_getErrorName(size_t code); /* provides error code string (useful for debugging) */ /*-***************************************** diff --git a/contrib/linux-kernel/lib/huf.h b/contrib/linux-kernel/lib/huf.h index e0a30ce00..f135226dc 100644 --- a/contrib/linux-kernel/lib/huf.h +++ b/contrib/linux-kernel/lib/huf.h @@ -45,7 +45,6 @@ size_t HUF_compressBound(size_t size); /**< maximum compressed size (worst /* Error Management */ unsigned HUF_isError(size_t code); /**< tells if a return value is an error code */ -const char* HUF_getErrorName(size_t code); /**< provides error code string (useful for debugging) */ /* *** Advanced function *** */