From be7da5d98b88f52eea93b4cfd41569ad9e9de247 Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Thu, 30 Mar 2017 11:40:05 -0700 Subject: [PATCH] Change stdlib includes to linux includes --- contrib/linux-kernel/include/zstd.h | 2 +- contrib/linux-kernel/lib/error_private.h | 2 +- contrib/linux-kernel/lib/fse.h | 2 +- contrib/linux-kernel/lib/fse_compress.c | 4 +--- contrib/linux-kernel/lib/fse_decompress.c | 3 +-- contrib/linux-kernel/lib/huf.h | 2 +- contrib/linux-kernel/lib/huf_compress.c | 3 +-- contrib/linux-kernel/lib/mem.h | 5 ++--- contrib/linux-kernel/lib/xxhash.c | 3 +-- contrib/linux-kernel/lib/xxhash.h | 2 +- contrib/linux-kernel/lib/zstd_common.c | 1 - contrib/linux-kernel/lib/zstd_compress.c | 2 +- contrib/linux-kernel/lib/zstd_decompress.c | 2 +- contrib/linux-kernel/lib/zstd_errors.h | 2 +- 14 files changed, 14 insertions(+), 21 deletions(-) diff --git a/contrib/linux-kernel/include/zstd.h b/contrib/linux-kernel/include/zstd.h index ff7f86a6d..8e1f805d0 100644 --- a/contrib/linux-kernel/include/zstd.h +++ b/contrib/linux-kernel/include/zstd.h @@ -11,7 +11,7 @@ #define ZSTD_H_235446 /* ====== Dependency ======*/ -#include /* size_t */ +#include /* size_t */ /* ===== ZSTDLIB_API : control library symbols visibility ===== */ diff --git a/contrib/linux-kernel/lib/error_private.h b/contrib/linux-kernel/lib/error_private.h index e88f2fd17..7b2ce36d4 100644 --- a/contrib/linux-kernel/lib/error_private.h +++ b/contrib/linux-kernel/lib/error_private.h @@ -15,7 +15,7 @@ /* **************************************** * Dependencies ******************************************/ -#include /* size_t */ +#include /* size_t */ #include "zstd_errors.h" /* enum list */ diff --git a/contrib/linux-kernel/lib/fse.h b/contrib/linux-kernel/lib/fse.h index 538d52427..b833f6c2c 100644 --- a/contrib/linux-kernel/lib/fse.h +++ b/contrib/linux-kernel/lib/fse.h @@ -38,7 +38,7 @@ /*-***************************************** * Dependencies ******************************************/ -#include /* size_t, ptrdiff_t */ +#include /* size_t, ptrdiff_t */ /*-***************************************** diff --git a/contrib/linux-kernel/lib/fse_compress.c b/contrib/linux-kernel/lib/fse_compress.c index dbfa510c6..29071c483 100644 --- a/contrib/linux-kernel/lib/fse_compress.c +++ b/contrib/linux-kernel/lib/fse_compress.c @@ -41,9 +41,7 @@ /* ************************************************************** * Includes ****************************************************************/ -#include /* malloc, free, qsort */ -#include /* memcpy, memset */ -#include /* printf (debug) */ +#include /* memcpy, memset */ #include "bitstream.h" #define FSE_STATIC_LINKING_ONLY #include "fse.h" diff --git a/contrib/linux-kernel/lib/fse_decompress.c b/contrib/linux-kernel/lib/fse_decompress.c index e53d99fb4..958a068bc 100644 --- a/contrib/linux-kernel/lib/fse_decompress.c +++ b/contrib/linux-kernel/lib/fse_decompress.c @@ -42,8 +42,7 @@ /* ************************************************************** * Includes ****************************************************************/ -#include /* malloc, free, qsort */ -#include /* memcpy, memset */ +#include /* memcpy, memset */ #include "bitstream.h" #define FSE_STATIC_LINKING_ONLY #include "fse.h" diff --git a/contrib/linux-kernel/lib/huf.h b/contrib/linux-kernel/lib/huf.h index f22a7d4f1..63306b4bf 100644 --- a/contrib/linux-kernel/lib/huf.h +++ b/contrib/linux-kernel/lib/huf.h @@ -36,7 +36,7 @@ /* *** Dependencies *** */ -#include /* size_t */ +#include /* size_t */ /* *** simple functions *** */ diff --git a/contrib/linux-kernel/lib/huf_compress.c b/contrib/linux-kernel/lib/huf_compress.c index fd5dd0edc..af1a1e6c3 100644 --- a/contrib/linux-kernel/lib/huf_compress.c +++ b/contrib/linux-kernel/lib/huf_compress.c @@ -36,8 +36,7 @@ /* ************************************************************** * Includes ****************************************************************/ -#include /* memcpy, memset */ -#include /* printf (debug) */ +#include /* memcpy, memset */ #include "bitstream.h" #define FSE_STATIC_LINKING_ONLY /* FSE_optimalTableLog_internal */ #include "fse.h" /* header compression */ diff --git a/contrib/linux-kernel/lib/mem.h b/contrib/linux-kernel/lib/mem.h index b79fc27c8..1b8098e72 100644 --- a/contrib/linux-kernel/lib/mem.h +++ b/contrib/linux-kernel/lib/mem.h @@ -13,8 +13,8 @@ /*-**************************************** * Dependencies ******************************************/ -#include /* size_t, ptrdiff_t */ -#include /* memcpy */ +#include /* size_t, ptrdiff_t */ +#include /* memcpy */ /*-**************************************** @@ -30,7 +30,6 @@ MEM_STATIC void MEM_check(void) { MEM_STATIC_ASSERT((sizeof(size_t)==4) || (size /*-************************************************************** * Basic Types *****************************************************************/ -#include typedef uint8_t BYTE; typedef uint16_t U16; typedef int16_t S16; diff --git a/contrib/linux-kernel/lib/xxhash.c b/contrib/linux-kernel/lib/xxhash.c index 808a843ee..dccdc65c9 100644 --- a/contrib/linux-kernel/lib/xxhash.c +++ b/contrib/linux-kernel/lib/xxhash.c @@ -67,11 +67,10 @@ ***************************************/ /* Modify the local functions below should you wish to use some other memory routines */ /* for malloc(), free() */ -#include static void* XXH_malloc(size_t s) { return malloc(s); } static void XXH_free (void* p) { free(p); } /* for memcpy() */ -#include +#include static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcpy(dest,src,size); } #ifndef XXH_STATIC_LINKING_ONLY diff --git a/contrib/linux-kernel/lib/xxhash.h b/contrib/linux-kernel/lib/xxhash.h index 17a678dd4..b6a56707e 100644 --- a/contrib/linux-kernel/lib/xxhash.h +++ b/contrib/linux-kernel/lib/xxhash.h @@ -71,7 +71,7 @@ XXH32 6.8 GB/s 6.0 GB/s /* **************************** * Definitions ******************************/ -#include /* size_t */ +#include /* size_t */ typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode; diff --git a/contrib/linux-kernel/lib/zstd_common.c b/contrib/linux-kernel/lib/zstd_common.c index 69199cb6f..3d24742ee 100644 --- a/contrib/linux-kernel/lib/zstd_common.c +++ b/contrib/linux-kernel/lib/zstd_common.c @@ -12,7 +12,6 @@ /*-************************************* * Dependencies ***************************************/ -#include /* malloc */ #include "error_private.h" #define ZSTD_STATIC_LINKING_ONLY #include "zstd.h" /* declaration of ZSTD_isError, ZSTD_getErrorName, ZSTD_getErrorCode, ZSTD_getErrorString, ZSTD_versionNumber */ diff --git a/contrib/linux-kernel/lib/zstd_compress.c b/contrib/linux-kernel/lib/zstd_compress.c index 84d898e57..d4b9a4751 100644 --- a/contrib/linux-kernel/lib/zstd_compress.c +++ b/contrib/linux-kernel/lib/zstd_compress.c @@ -11,7 +11,7 @@ /*-************************************* * Dependencies ***************************************/ -#include /* memset */ +#include /* memset */ #include "mem.h" #define FSE_STATIC_LINKING_ONLY /* FSE_encodeSymbol */ #include "fse.h" diff --git a/contrib/linux-kernel/lib/zstd_decompress.c b/contrib/linux-kernel/lib/zstd_decompress.c index 82386c2e8..bb72d6a4a 100644 --- a/contrib/linux-kernel/lib/zstd_decompress.c +++ b/contrib/linux-kernel/lib/zstd_decompress.c @@ -24,7 +24,7 @@ /*-******************************************************* * Dependencies *********************************************************/ -#include /* memcpy, memmove, memset */ +#include /* memcpy, memmove, memset */ #include "mem.h" /* low level memory routines */ #define FSE_STATIC_LINKING_ONLY #include "fse.h" diff --git a/contrib/linux-kernel/lib/zstd_errors.h b/contrib/linux-kernel/lib/zstd_errors.h index 8285df8e5..37e491b7e 100644 --- a/contrib/linux-kernel/lib/zstd_errors.h +++ b/contrib/linux-kernel/lib/zstd_errors.h @@ -11,7 +11,7 @@ #define ZSTD_ERRORS_H_398273423 /*===== dependency =====*/ -#include /* size_t */ +#include /* size_t */ /* ===== ZSTDERRORLIB_API : control library symbols visibility ===== */