From d0d5ce4c00469d4f11970e649e55217a659b4690 Mon Sep 17 00:00:00 2001 From: Victor Zhang Date: Thu, 19 Dec 2024 16:00:11 -0800 Subject: [PATCH] Remove extern C blocks from lib/* internal APIs (except xxhash.h) --- lib/common/error_private.h | 8 -------- lib/common/huf.h | 8 -------- lib/common/mem.h | 10 ---------- lib/common/pool.h | 9 --------- lib/common/threading.h | 27 --------------------------- lib/common/zstd_internal.h | 8 -------- lib/common/zstd_trace.h | 8 -------- lib/compress/zstd_compress_internal.h | 8 -------- lib/compress/zstd_cwksp.h | 8 -------- lib/compress/zstd_double_fast.h | 8 -------- lib/compress/zstd_fast.h | 8 -------- lib/compress/zstd_lazy.h | 9 --------- lib/compress/zstd_ldm.h | 8 -------- lib/compress/zstd_opt.h | 8 -------- lib/compress/zstd_preSplit.h | 8 -------- lib/compress/zstdmt_compress.h | 10 ---------- lib/dictBuilder/divsufsort.h | 10 ---------- 17 files changed, 163 deletions(-) diff --git a/lib/common/error_private.h b/lib/common/error_private.h index 06233aaa8..9dcc85951 100644 --- a/lib/common/error_private.h +++ b/lib/common/error_private.h @@ -21,10 +21,6 @@ #include "debug.h" #include "zstd_deps.h" /* size_t */ -#if defined (__cplusplus) -extern "C" { -#endif - /* **************************************** * Compiler-specific ******************************************/ @@ -159,8 +155,4 @@ void _force_has_format_string(const char *format, ...) { } \ } while(0) -#if defined (__cplusplus) -} -#endif - #endif /* ERROR_H_MODULE */ diff --git a/lib/common/huf.h b/lib/common/huf.h index 962fe43fa..4b142c4f9 100644 --- a/lib/common/huf.h +++ b/lib/common/huf.h @@ -21,10 +21,6 @@ #define FSE_STATIC_LINKING_ONLY #include "fse.h" -#if defined (__cplusplus) -extern "C" { -#endif - /* *** Tool functions *** */ #define HUF_BLOCKSIZE_MAX (128 * 1024) /**< maximum input size for a single block compressed with HUF_compress */ size_t HUF_compressBound(size_t size); /**< maximum compressed size (worst case) */ @@ -278,8 +274,4 @@ size_t HUF_readDTableX1_wksp(HUF_DTable* DTable, const void* src, size_t srcSize size_t HUF_readDTableX2_wksp(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize, int flags); #endif -#if defined (__cplusplus) -} -#endif - #endif /* HUF_H_298734234 */ diff --git a/lib/common/mem.h b/lib/common/mem.h index 1b0a946ad..ca756e237 100644 --- a/lib/common/mem.h +++ b/lib/common/mem.h @@ -72,11 +72,6 @@ typedef signed long long S64; #endif - -#if defined (__cplusplus) -extern "C" { -#endif - /*-************************************************************** * Memory I/O API *****************************************************************/ @@ -424,9 +419,4 @@ MEM_STATIC void MEM_writeBEST(void* memPtr, size_t val) /* code only tested on 32 and 64 bits systems */ MEM_STATIC void MEM_check(void) { DEBUG_STATIC_ASSERT((sizeof(size_t)==4) || (sizeof(size_t)==8)); } - -#if defined (__cplusplus) -} -#endif - #endif /* MEM_H_MODULE */ diff --git a/lib/common/pool.h b/lib/common/pool.h index d34082dc1..f39b7f1eb 100644 --- a/lib/common/pool.h +++ b/lib/common/pool.h @@ -16,10 +16,6 @@ #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_customMem */ #include "../zstd.h" -#if defined (__cplusplus) -extern "C" { -#endif - typedef struct POOL_ctx_s POOL_ctx; /*! POOL_create() : @@ -82,9 +78,4 @@ void POOL_add(POOL_ctx* ctx, POOL_function function, void* opaque); */ int POOL_tryAdd(POOL_ctx* ctx, POOL_function function, void* opaque); - -#if defined (__cplusplus) -} -#endif - #endif diff --git a/lib/common/threading.h b/lib/common/threading.h index 85b6a3ac8..e123cdf14 100644 --- a/lib/common/threading.h +++ b/lib/common/threading.h @@ -56,11 +56,6 @@ #define ZSTD_pthread_cond_signal(a) WakeConditionVariable((a)) #define ZSTD_pthread_cond_broadcast(a) WakeAllConditionVariable((a)) - -#if defined (__cplusplus) -extern "C" { -#endif - /* ZSTD_pthread_create() and ZSTD_pthread_join() */ typedef HANDLE ZSTD_pthread_t; @@ -73,20 +68,10 @@ int ZSTD_pthread_join(ZSTD_pthread_t thread); * add here more wrappers as required */ - -#if defined (__cplusplus) -} -#endif - #elif defined(ZSTD_MULTITHREAD) /* posix assumed ; need a better detection method */ /* === POSIX Systems === */ # include - -#if defined (__cplusplus) -extern "C" { -#endif - #if DEBUGLEVEL < 1 #define ZSTD_pthread_mutex_t pthread_mutex_t @@ -133,17 +118,9 @@ int ZSTD_pthread_cond_destroy(ZSTD_pthread_cond_t* cond); #endif -#if defined (__cplusplus) -} -#endif - #else /* ZSTD_MULTITHREAD not defined */ /* No multithreading support */ -#if defined (__cplusplus) -extern "C" { -#endif - typedef int ZSTD_pthread_mutex_t; #define ZSTD_pthread_mutex_init(a, b) ((void)(a), (void)(b), 0) #define ZSTD_pthread_mutex_destroy(a) ((void)(a)) @@ -159,10 +136,6 @@ typedef int ZSTD_pthread_cond_t; /* do not use ZSTD_pthread_t */ -#if defined (__cplusplus) -} -#endif - #endif /* ZSTD_MULTITHREAD */ diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h index ecb9cfba8..e40d15a05 100644 --- a/lib/common/zstd_internal.h +++ b/lib/common/zstd_internal.h @@ -39,10 +39,6 @@ # define ZSTD_TRACE 0 #endif -#if defined (__cplusplus) -extern "C" { -#endif - /* ---- static assert (debug) --- */ #define ZSTD_STATIC_ASSERT(c) DEBUG_STATIC_ASSERT(c) #define ZSTD_isError ERR_isError /* for inlining */ @@ -385,8 +381,4 @@ MEM_STATIC int ZSTD_cpuSupportsBmi2(void) return ZSTD_cpuid_bmi1(cpuid) && ZSTD_cpuid_bmi2(cpuid); } -#if defined (__cplusplus) -} -#endif - #endif /* ZSTD_CCOMMON_H_MODULE */ diff --git a/lib/common/zstd_trace.h b/lib/common/zstd_trace.h index b9187079c..198438a7c 100644 --- a/lib/common/zstd_trace.h +++ b/lib/common/zstd_trace.h @@ -13,10 +13,6 @@ #include -#if defined (__cplusplus) -extern "C" { -#endif - /* weak symbol support * For now, enable conservatively: * - Only GNUC @@ -157,8 +153,4 @@ ZSTD_WEAK_ATTR void ZSTD_trace_decompress_end( #endif /* ZSTD_TRACE */ -#if defined (__cplusplus) -} -#endif - #endif /* ZSTD_TRACE_H */ diff --git a/lib/compress/zstd_compress_internal.h b/lib/compress/zstd_compress_internal.h index 2d3510adc..bbca66cd3 100644 --- a/lib/compress/zstd_compress_internal.h +++ b/lib/compress/zstd_compress_internal.h @@ -26,10 +26,6 @@ #include "../common/bits.h" /* ZSTD_highbit32, ZSTD_NbCommonBytes */ #include "zstd_preSplit.h" /* ZSTD_SLIPBLOCK_WORKSPACESIZE */ -#if defined (__cplusplus) -extern "C" { -#endif - /*-************************************* * Constants ***************************************/ @@ -1426,10 +1422,6 @@ MEM_STATIC int ZSTD_comparePackedTags(size_t packedTag1, size_t packedTag2) { return tag1 == tag2; } -#if defined (__cplusplus) -} -#endif - /* =============================================================== * Shared internal declarations * These prototypes may be called from sources not in lib/compress diff --git a/lib/compress/zstd_cwksp.h b/lib/compress/zstd_cwksp.h index aa4c3e49e..77518002d 100644 --- a/lib/compress/zstd_cwksp.h +++ b/lib/compress/zstd_cwksp.h @@ -19,10 +19,6 @@ #include "../common/portability_macros.h" #include "../common/compiler.h" /* ZS2_isPower2 */ -#if defined (__cplusplus) -extern "C" { -#endif - /*-************************************* * Constants ***************************************/ @@ -766,8 +762,4 @@ MEM_STATIC void ZSTD_cwksp_bump_oversized_duration( } } -#if defined (__cplusplus) -} -#endif - #endif /* ZSTD_CWKSP_H */ diff --git a/lib/compress/zstd_double_fast.h b/lib/compress/zstd_double_fast.h index ae66f3142..a4d4d345e 100644 --- a/lib/compress/zstd_double_fast.h +++ b/lib/compress/zstd_double_fast.h @@ -14,10 +14,6 @@ #include "../common/mem.h" /* U32 */ #include "zstd_compress_internal.h" /* ZSTD_CCtx, size_t */ -#if defined (__cplusplus) -extern "C" { -#endif - #ifndef ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms, @@ -43,8 +39,4 @@ size_t ZSTD_compressBlock_doubleFast_extDict( #define ZSTD_COMPRESSBLOCK_DOUBLEFAST_EXTDICT NULL #endif /* ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR */ -#if defined (__cplusplus) -} -#endif - #endif /* ZSTD_DOUBLE_FAST_H */ diff --git a/lib/compress/zstd_fast.h b/lib/compress/zstd_fast.h index f92cf35b9..8bbed8f97 100644 --- a/lib/compress/zstd_fast.h +++ b/lib/compress/zstd_fast.h @@ -14,10 +14,6 @@ #include "../common/mem.h" /* U32 */ #include "zstd_compress_internal.h" -#if defined (__cplusplus) -extern "C" { -#endif - void ZSTD_fillHashTable(ZSTD_matchState_t* ms, void const* end, ZSTD_dictTableLoadMethod_e dtlm, ZSTD_tableFillPurpose_e tfp); @@ -31,8 +27,4 @@ size_t ZSTD_compressBlock_fast_extDict( ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM], void const* src, size_t srcSize); -#if defined (__cplusplus) -} -#endif - #endif /* ZSTD_FAST_H */ diff --git a/lib/compress/zstd_lazy.h b/lib/compress/zstd_lazy.h index bec17b124..cd4e1c7fa 100644 --- a/lib/compress/zstd_lazy.h +++ b/lib/compress/zstd_lazy.h @@ -13,10 +13,6 @@ #include "zstd_compress_internal.h" -#if defined (__cplusplus) -extern "C" { -#endif - /** * Dedicated Dictionary Search Structure bucket log. In the * ZSTD_dedicatedDictSearch mode, the hashTable has @@ -194,9 +190,4 @@ size_t ZSTD_compressBlock_btlazy2_extDict( #define ZSTD_COMPRESSBLOCK_BTLAZY2_EXTDICT NULL #endif - -#if defined (__cplusplus) -} -#endif - #endif /* ZSTD_LAZY_H */ diff --git a/lib/compress/zstd_ldm.h b/lib/compress/zstd_ldm.h index 847c2befb..592b95a98 100644 --- a/lib/compress/zstd_ldm.h +++ b/lib/compress/zstd_ldm.h @@ -14,10 +14,6 @@ #include "zstd_compress_internal.h" /* ldmParams_t, U32 */ #include "../zstd.h" /* ZSTD_CCtx, size_t */ -#if defined (__cplusplus) -extern "C" { -#endif - /*-************************************* * Long distance matching ***************************************/ @@ -110,8 +106,4 @@ size_t ZSTD_ldm_getMaxNbSeq(ldmParams_t params, size_t maxChunkSize); void ZSTD_ldm_adjustParameters(ldmParams_t* params, ZSTD_compressionParameters const* cParams); -#if defined (__cplusplus) -} -#endif - #endif /* ZSTD_FAST_H */ diff --git a/lib/compress/zstd_opt.h b/lib/compress/zstd_opt.h index 7ce6fdae7..cace81494 100644 --- a/lib/compress/zstd_opt.h +++ b/lib/compress/zstd_opt.h @@ -13,10 +13,6 @@ #include "zstd_compress_internal.h" -#if defined (__cplusplus) -extern "C" { -#endif - #if !defined(ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR) \ || !defined(ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR) \ || !defined(ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR) @@ -73,8 +69,4 @@ size_t ZSTD_compressBlock_btultra2( #define ZSTD_COMPRESSBLOCK_BTULTRA2 NULL #endif -#if defined (__cplusplus) -} -#endif - #endif /* ZSTD_OPT_H */ diff --git a/lib/compress/zstd_preSplit.h b/lib/compress/zstd_preSplit.h index d606a52b5..b89a200dc 100644 --- a/lib/compress/zstd_preSplit.h +++ b/lib/compress/zstd_preSplit.h @@ -13,10 +13,6 @@ #include /* size_t */ -#if defined (__cplusplus) -extern "C" { -#endif - #define ZSTD_SLIPBLOCK_WORKSPACESIZE 8208 /* ZSTD_splitBlock(): @@ -34,8 +30,4 @@ size_t ZSTD_splitBlock(const void* blockStart, size_t blockSize, int level, void* workspace, size_t wkspSize); -#if defined (__cplusplus) -} -#endif - #endif /* ZSTD_PRESPLIT_H */ diff --git a/lib/compress/zstdmt_compress.h b/lib/compress/zstdmt_compress.h index 9a58b5ad3..91b489b9c 100644 --- a/lib/compress/zstdmt_compress.h +++ b/lib/compress/zstdmt_compress.h @@ -16,11 +16,6 @@ #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_parameters */ #include "../zstd.h" /* ZSTD_inBuffer, ZSTD_outBuffer, ZSTDLIB_API */ - #if defined (__cplusplus) - extern "C" { - #endif - - /* Note : This is an internal API. * These APIs used to be exposed with ZSTDLIB_API, * because it used to be the only way to invoke MT compression. @@ -104,9 +99,4 @@ void ZSTDMT_updateCParams_whileCompressing(ZSTDMT_CCtx* mtctx, const ZSTD_CCtx_p */ ZSTD_frameProgression ZSTDMT_getFrameProgression(ZSTDMT_CCtx* mtctx); - -#if defined (__cplusplus) -} -#endif - #endif /* ZSTDMT_COMPRESS_H */ diff --git a/lib/dictBuilder/divsufsort.h b/lib/dictBuilder/divsufsort.h index 5440994af..3ed2b287a 100644 --- a/lib/dictBuilder/divsufsort.h +++ b/lib/dictBuilder/divsufsort.h @@ -27,11 +27,6 @@ #ifndef _DIVSUFSORT_H #define _DIVSUFSORT_H 1 -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - /*- Prototypes -*/ /** @@ -59,9 +54,4 @@ divsufsort(const unsigned char *T, int *SA, int n, int openMP); int divbwt(const unsigned char *T, unsigned char *U, int *A, int n, unsigned char * num_indexes, int * indexes, int openMP); - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* __cplusplus */ - #endif /* _DIVSUFSORT_H */ -- 2.47.2