lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-30 22:23:13 +03:00
Code Activity

Move #includes out of extern "C" blocks

Browse Source 
Do some include shuffling for `**.h` files within lib, programs, tests, and zlibWrapper.
`lib/legacy` and `lib/deprecated` are untouched.
`#include`s within `extern "C"` blocks in .cpp files are untouched.

todo: shuffling for `xxhash.h`
This commit is contained in:
Victor Zhang
2024-12-17 17:55:07 -08:00
parent 0218c8de0f
commit fc726da774
27 changed files with 135 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/seekable_format/zstd_seekable.h
View File

@ -1,13 +1,13 @@
#ifndef SEEKABLE_H #ifndef SEEKABLE_H
#define SEEKABLE_H #define SEEKABLE_H
#include <stdio.h>
#include "zstd.h" /* ZSTDLIB_API */
#if defined (__cplusplus) #if defined (__cplusplus)
extern "C" { extern "C" {
#endif #endif
#include <stdio.h>
#include "zstd.h" /* ZSTDLIB_API */
#define ZSTD_seekTableFooterSize 9 #define ZSTD_seekTableFooterSize 9

8
lib/common/bitstream.h
View File

@ -14,9 +14,6 @@
#ifndef BITSTREAM_H_MODULE #ifndef BITSTREAM_H_MODULE
#define BITSTREAM_H_MODULE #define BITSTREAM_H_MODULE
#if defined (__cplusplus)
extern "C" {
#endif
/* /*
* This API consists of small unitary functions, which must be inlined for best performance. * This API consists of small unitary functions, which must be inlined for best performance.
* Since link-time-optimization is not available for all compilers, * Since link-time-optimization is not available for all compilers,
@ -32,7 +29,6 @@ extern "C" {
#include "error_private.h" /* error codes and messages */ #include "error_private.h" /* error codes and messages */
#include "bits.h" /* ZSTD_highbit32 */ #include "bits.h" /* ZSTD_highbit32 */
/*========================================= /*=========================================
* Target specific * Target specific
=========================================*/ =========================================*/
@ -44,6 +40,10 @@ extern "C" {
# endif # endif
#endif #endif
#if defined (__cplusplus)
extern "C" {
#endif
#define STREAM_ACCUMULATOR_MIN_32 25 #define STREAM_ACCUMULATOR_MIN_32 25
#define STREAM_ACCUMULATOR_MIN_64 57 #define STREAM_ACCUMULATOR_MIN_64 57
#define STREAM_ACCUMULATOR_MIN ((U32)(MEM_32bits() ? STREAM_ACCUMULATOR_MIN_32 : STREAM_ACCUMULATOR_MIN_64)) #define STREAM_ACCUMULATOR_MIN ((U32)(MEM_32bits() ? STREAM_ACCUMULATOR_MIN_32 : STREAM_ACCUMULATOR_MIN_64))

9
lib/common/debug.h
View File

@ -32,10 +32,6 @@
#ifndef DEBUG_H_12987983217 #ifndef DEBUG_H_12987983217
#define DEBUG_H_12987983217 #define DEBUG_H_12987983217
#if defined (__cplusplus)
extern "C" {
#endif
/* static assert is triggered at compile time, leaving no runtime artefact. /* static assert is triggered at compile time, leaving no runtime artefact.
* static assert only works with compile-time constants. * static assert only works with compile-time constants.
@ -75,9 +71,12 @@ extern "C" {
# endif # endif
#endif #endif
#if defined (__cplusplus)
extern "C" {
#endif
#if (DEBUGLEVEL>=2) #if (DEBUGLEVEL>=2)
# define ZSTD_DEPS_NEED_IO # define ZSTD_DEPS_NEED_IO
# include "zstd_deps.h"
extern int g_debuglevel; /* the variable is only declared, extern int g_debuglevel; /* the variable is only declared,
it actually lives in debug.c, it actually lives in debug.c,
and is shared by the whole process. and is shared by the whole process.

8
lib/common/error_private.h
View File

@ -13,11 +13,6 @@
#ifndef ERROR_H_MODULE #ifndef ERROR_H_MODULE
#define ERROR_H_MODULE #define ERROR_H_MODULE
#if defined (__cplusplus)
extern "C" {
#endif
/* **************************************** /* ****************************************
* Dependencies * Dependencies
******************************************/ ******************************************/
@ -26,6 +21,9 @@ extern "C" {
#include "debug.h" #include "debug.h"
#include "zstd_deps.h" /* size_t */ #include "zstd_deps.h" /* size_t */
#if defined (__cplusplus)
extern "C" {
#endif
/* **************************************** /* ****************************************
* Compiler-specific * Compiler-specific

16
lib/common/fse.h
View File

@ -11,11 +11,6 @@
* in the COPYING file in the root directory of this source tree). * in the COPYING file in the root directory of this source tree).
* You may select, at your option, one of the above-listed licenses. * You may select, at your option, one of the above-listed licenses.
****************************************************************** */ ****************************************************************** */
#if defined (__cplusplus)
extern "C" {
#endif
#ifndef FSE_H #ifndef FSE_H
#define FSE_H #define FSE_H
@ -25,6 +20,14 @@ extern "C" {
******************************************/ ******************************************/
#include "zstd_deps.h" /* size_t, ptrdiff_t */ #include "zstd_deps.h" /* size_t, ptrdiff_t */
#if defined(FSE_STATIC_LINKING_ONLY) && !defined(FSE_H_FSE_STATIC_LINKING_ONLY)
#define FSE_H_FSE_STATIC_LINKING_ONLY
#include "bitstream.h"
#endif
#if defined (__cplusplus)
extern "C" {
#endif
/*-***************************************** /*-*****************************************
* FSE_PUBLIC_API : control library symbols visibility * FSE_PUBLIC_API : control library symbols visibility
@ -233,9 +236,6 @@ If there is an error, the function will return an error code, which can be teste
#if defined(FSE_STATIC_LINKING_ONLY) && !defined(FSE_H_FSE_STATIC_LINKING_ONLY) #if defined(FSE_STATIC_LINKING_ONLY) && !defined(FSE_H_FSE_STATIC_LINKING_ONLY)
#define FSE_H_FSE_STATIC_LINKING_ONLY #define FSE_H_FSE_STATIC_LINKING_ONLY
/* *** Dependency *** */
#include "bitstream.h"
/* ***************************************** /* *****************************************
* Static allocation * Static allocation

7
lib/common/huf.h
View File

@ -12,10 +12,6 @@
* You may select, at your option, one of the above-listed licenses. * You may select, at your option, one of the above-listed licenses.
****************************************************************** */ ****************************************************************** */
#if defined (__cplusplus)
extern "C" {
#endif
#ifndef HUF_H_298734234 #ifndef HUF_H_298734234
#define HUF_H_298734234 #define HUF_H_298734234
@ -25,6 +21,9 @@ extern "C" {
#define FSE_STATIC_LINKING_ONLY #define FSE_STATIC_LINKING_ONLY
#include "fse.h" #include "fse.h"
#if defined (__cplusplus)
extern "C" {
#endif
/* *** Tool functions *** */ /* *** Tool functions *** */
#define HUF_BLOCKSIZE_MAX (128 * 1024) /**< maximum input size for a single block compressed with HUF_compress */ #define HUF_BLOCKSIZE_MAX (128 * 1024) /**< maximum input size for a single block compressed with HUF_compress */

8
lib/common/mem.h
View File

@ -11,10 +11,6 @@
#ifndef MEM_H_MODULE #ifndef MEM_H_MODULE
#define MEM_H_MODULE #define MEM_H_MODULE
#if defined (__cplusplus)
extern "C" {
#endif
/*-**************************************** /*-****************************************
* Dependencies * Dependencies
******************************************/ ******************************************/
@ -77,6 +73,10 @@ extern "C" {
#endif #endif
#if defined (__cplusplus)
extern "C" {
#endif
/*-************************************************************** /*-**************************************************************
* Memory I/O API * Memory I/O API
*****************************************************************/ *****************************************************************/

8
lib/common/pool.h
View File

@ -11,15 +11,15 @@
#ifndef POOL_H #ifndef POOL_H
#define POOL_H #define POOL_H
#if defined (__cplusplus)
extern "C" {
#endif
#include "zstd_deps.h" #include "zstd_deps.h"
#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_customMem */ #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_customMem */
#include "../zstd.h" #include "../zstd.h"
#if defined (__cplusplus)
extern "C" {
#endif
typedef struct POOL_ctx_s POOL_ctx; typedef struct POOL_ctx_s POOL_ctx;
/*! POOL_create() : /*! POOL_create() :

27
lib/common/threading.h
View File

@ -16,10 +16,6 @@
#include "debug.h" #include "debug.h"
#if defined (__cplusplus)
extern "C" {
#endif
#if defined(ZSTD_MULTITHREAD) && defined(_WIN32) #if defined(ZSTD_MULTITHREAD) && defined(_WIN32)
/** /**
@ -60,6 +56,11 @@ extern "C" {
#define ZSTD_pthread_cond_signal(a) WakeConditionVariable((a)) #define ZSTD_pthread_cond_signal(a) WakeConditionVariable((a))
#define ZSTD_pthread_cond_broadcast(a) WakeAllConditionVariable((a)) #define ZSTD_pthread_cond_broadcast(a) WakeAllConditionVariable((a))
#if defined (__cplusplus)
extern "C" {
#endif
/* ZSTD_pthread_create() and ZSTD_pthread_join() */ /* ZSTD_pthread_create() and ZSTD_pthread_join() */
typedef HANDLE ZSTD_pthread_t; typedef HANDLE ZSTD_pthread_t;
@ -73,10 +74,19 @@ int ZSTD_pthread_join(ZSTD_pthread_t thread);
*/ */
#if defined (__cplusplus)
}
#endif
#elif defined(ZSTD_MULTITHREAD) /* posix assumed ; need a better detection method */ #elif defined(ZSTD_MULTITHREAD) /* posix assumed ; need a better detection method */
/* === POSIX Systems === */ /* === POSIX Systems === */
# include <pthread.h> # include <pthread.h>
#if defined (__cplusplus)
extern "C" {
#endif
#if DEBUGLEVEL < 1 #if DEBUGLEVEL < 1
#define ZSTD_pthread_mutex_t pthread_mutex_t #define ZSTD_pthread_mutex_t pthread_mutex_t
@ -123,9 +133,18 @@ int ZSTD_pthread_cond_destroy(ZSTD_pthread_cond_t* cond);
#endif #endif
#if defined (__cplusplus)
}
#endif
#else /* ZSTD_MULTITHREAD not defined */ #else /* ZSTD_MULTITHREAD not defined */
/* No multithreading support */ /* No multithreading support */
#if defined (__cplusplus)
extern "C" {
#endif
typedef int ZSTD_pthread_mutex_t; typedef int ZSTD_pthread_mutex_t;
#define ZSTD_pthread_mutex_init(a, b) ((void)(a), (void)(b), 0) #define ZSTD_pthread_mutex_init(a, b) ((void)(a), (void)(b), 0)
#define ZSTD_pthread_mutex_destroy(a) ((void)(a)) #define ZSTD_pthread_mutex_destroy(a) ((void)(a))

4
lib/common/zstd_trace.h
View File

@ -11,12 +11,12 @@
#ifndef ZSTD_TRACE_H #ifndef ZSTD_TRACE_H
#define ZSTD_TRACE_H #define ZSTD_TRACE_H
#include <stddef.h>
#if defined (__cplusplus) #if defined (__cplusplus)
extern "C" { extern "C" {
#endif #endif
#include <stddef.h>
/* weak symbol support /* weak symbol support
* For now, enable conservatively: * For now, enable conservatively:
* - Only GNUC * - Only GNUC

6
lib/compress/zstd_double_fast.h
View File

@ -11,13 +11,13 @@
#ifndef ZSTD_DOUBLE_FAST_H #ifndef ZSTD_DOUBLE_FAST_H
#define ZSTD_DOUBLE_FAST_H #define ZSTD_DOUBLE_FAST_H
#include "../common/mem.h" /* U32 */
#include "zstd_compress_internal.h" /* ZSTD_CCtx, size_t */
#if defined (__cplusplus) #if defined (__cplusplus)
extern "C" { extern "C" {
#endif #endif
#include "../common/mem.h" /* U32 */
#include "zstd_compress_internal.h" /* ZSTD_CCtx, size_t */
#ifndef ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR #ifndef ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR
void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms, void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms,

6
lib/compress/zstd_fast.h
View File

@ -11,13 +11,13 @@
#ifndef ZSTD_FAST_H #ifndef ZSTD_FAST_H
#define ZSTD_FAST_H #define ZSTD_FAST_H
#include "../common/mem.h" /* U32 */
#include "zstd_compress_internal.h"
#if defined (__cplusplus) #if defined (__cplusplus)
extern "C" { extern "C" {
#endif #endif
#include "../common/mem.h" /* U32 */
#include "zstd_compress_internal.h"
void ZSTD_fillHashTable(ZSTD_matchState_t* ms, void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
void const* end, ZSTD_dictTableLoadMethod_e dtlm, void const* end, ZSTD_dictTableLoadMethod_e dtlm,
ZSTD_tableFillPurpose_e tfp); ZSTD_tableFillPurpose_e tfp);

4
lib/compress/zstd_lazy.h
View File

@ -11,12 +11,12 @@
#ifndef ZSTD_LAZY_H #ifndef ZSTD_LAZY_H
#define ZSTD_LAZY_H #define ZSTD_LAZY_H
#include "zstd_compress_internal.h"
#if defined (__cplusplus) #if defined (__cplusplus)
extern "C" { extern "C" {
#endif #endif
#include "zstd_compress_internal.h"
/** /**
* Dedicated Dictionary Search Structure bucket log. In the * Dedicated Dictionary Search Structure bucket log. In the
* ZSTD_dedicatedDictSearch mode, the hashTable has * ZSTD_dedicatedDictSearch mode, the hashTable has

6
lib/compress/zstd_ldm.h
View File

@ -11,13 +11,13 @@
#ifndef ZSTD_LDM_H #ifndef ZSTD_LDM_H
#define ZSTD_LDM_H #define ZSTD_LDM_H
#include "zstd_compress_internal.h" /* ldmParams_t, U32 */
#include "../zstd.h" /* ZSTD_CCtx, size_t */
#if defined (__cplusplus) #if defined (__cplusplus)
extern "C" { extern "C" {
#endif #endif
#include "zstd_compress_internal.h" /* ldmParams_t, U32 */
#include "../zstd.h" /* ZSTD_CCtx, size_t */
/*-************************************* /*-*************************************
* Long distance matching * Long distance matching
***************************************/ ***************************************/

4
lib/compress/zstd_opt.h
View File

@ -11,12 +11,12 @@
#ifndef ZSTD_OPT_H #ifndef ZSTD_OPT_H
#define ZSTD_OPT_H #define ZSTD_OPT_H
#include "zstd_compress_internal.h"
#if defined (__cplusplus) #if defined (__cplusplus)
extern "C" { extern "C" {
#endif #endif
#include "zstd_compress_internal.h"
#if !defined(ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR) \ #if !defined(ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR) \
|| !defined(ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR) \ || !defined(ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR) \
|| !defined(ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR) || !defined(ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR)

11
lib/compress/zstdmt_compress.h
View File

@ -11,6 +11,11 @@
#ifndef ZSTDMT_COMPRESS_H #ifndef ZSTDMT_COMPRESS_H
#define ZSTDMT_COMPRESS_H #define ZSTDMT_COMPRESS_H
/* === Dependencies === */
#include "../common/zstd_deps.h" /* size_t */
#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_parameters */
#include "../zstd.h" /* ZSTD_inBuffer, ZSTD_outBuffer, ZSTDLIB_API */
#if defined (__cplusplus) #if defined (__cplusplus)
extern "C" { extern "C" {
#endif #endif
@ -25,12 +30,6 @@
* otherwise ZSTDMT_createCCtx*() will fail. * otherwise ZSTDMT_createCCtx*() will fail.
*/ */
/* === Dependencies === */
#include "../common/zstd_deps.h" /* size_t */
#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_parameters */
#include "../zstd.h" /* ZSTD_inBuffer, ZSTD_outBuffer, ZSTDLIB_API */
/* === Constants === */ /* === Constants === */
#ifndef ZSTDMT_NBWORKERS_MAX /* a different value can be selected at compile time */ #ifndef ZSTDMT_NBWORKERS_MAX /* a different value can be selected at compile time */
# define ZSTDMT_NBWORKERS_MAX ((sizeof(void*)==4) /*32-bit*/ ? 64 : 256) # define ZSTDMT_NBWORKERS_MAX ((sizeof(void*)==4) /*32-bit*/ ? 64 : 256)

8
lib/zdict.h
View File

@ -8,16 +8,16 @@
* You may select, at your option, one of the above-listed licenses. * You may select, at your option, one of the above-listed licenses.
*/ */
#if defined (__cplusplus)
extern "C" {
#endif
#ifndef ZSTD_ZDICT_H #ifndef ZSTD_ZDICT_H
#define ZSTD_ZDICT_H #define ZSTD_ZDICT_H
/*====== Dependencies ======*/ /*====== Dependencies ======*/
#include <stddef.h> /* size_t */ #include <stddef.h> /* size_t */
#if defined (__cplusplus)
extern "C" {
#endif
/* ===== ZDICTLIB_API : control library symbols visibility ===== */ /* ===== ZDICTLIB_API : control library symbols visibility ===== */
#ifndef ZDICTLIB_VISIBLE #ifndef ZDICTLIB_VISIBLE

15
lib/zstd.h
View File

@ -7,16 +7,22 @@
* in the COPYING file in the root directory of this source tree). * in the COPYING file in the root directory of this source tree).
* You may select, at your option, one of the above-listed licenses. * You may select, at your option, one of the above-listed licenses.
*/ */
#if defined (__cplusplus)
extern "C" {
#endif
#ifndef ZSTD_H_235446 #ifndef ZSTD_H_235446
#define ZSTD_H_235446 #define ZSTD_H_235446
/* ====== Dependencies ======*/ /* ====== Dependencies ======*/
#include <stddef.h> /* size_t */ #include <stddef.h> /* size_t */
#include "zstd_errors.h" /* list of errors */
#if defined(ZSTD_STATIC_LINKING_ONLY) && !defined(ZSTD_H_ZSTD_STATIC_LINKING_ONLY)
#include <limits.h> /* INT_MAX */
#endif /* ZSTD_STATIC_LINKING_ONLY */
#if defined (__cplusplus)
extern "C" {
#endif
/* ===== ZSTDLIB_API : control library symbols visibility ===== */ /* ===== ZSTDLIB_API : control library symbols visibility ===== */
#ifndef ZSTDLIB_VISIBLE #ifndef ZSTDLIB_VISIBLE
@ -240,7 +246,6 @@ ZSTDLIB_API size_t ZSTD_compressBound(size_t srcSize); /*!< maximum compressed s
/*====== Error helper functions ======*/ /*====== Error helper functions ======*/
#include "zstd_errors.h" /* list of errors */
/* ZSTD_isError() : /* ZSTD_isError() :
* Most ZSTD_* functions returning a size_t value can be tested for error, * Most ZSTD_* functions returning a size_t value can be tested for error,
* using ZSTD_isError(). * using ZSTD_isError().
@ -1215,8 +1220,6 @@ ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict);
#if defined(ZSTD_STATIC_LINKING_ONLY) && !defined(ZSTD_H_ZSTD_STATIC_LINKING_ONLY) #if defined(ZSTD_STATIC_LINKING_ONLY) && !defined(ZSTD_H_ZSTD_STATIC_LINKING_ONLY)
#define ZSTD_H_ZSTD_STATIC_LINKING_ONLY #define ZSTD_H_ZSTD_STATIC_LINKING_ONLY
#include <limits.h> /* INT_MAX */
/* This can be overridden externally to hide static symbols. */ /* This can be overridden externally to hide static symbols. */
#ifndef ZSTDLIB_STATIC_API #ifndef ZSTDLIB_STATIC_API
# if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1) # if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)

8
programs/benchfn.h
View File

@ -15,10 +15,6 @@
* or detecting and returning an error * or detecting and returning an error
*/ */
#if defined (__cplusplus)
extern "C" {
#endif
#ifndef BENCH_FN_H_23876 #ifndef BENCH_FN_H_23876
#define BENCH_FN_H_23876 #define BENCH_FN_H_23876
@ -26,6 +22,10 @@ extern "C" {
#include <stddef.h> /* size_t */ #include <stddef.h> /* size_t */
#if defined (__cplusplus)
extern "C" {
#endif
/* ==== Benchmark any function, iterated on a set of blocks ==== */ /* ==== Benchmark any function, iterated on a set of blocks ==== */
/* BMK_runTime_t: valid result return type */ /* BMK_runTime_t: valid result return type */

8
programs/benchzstd.h
View File

@ -14,10 +14,6 @@
* and display progress result and final summary * and display progress result and final summary
*/ */
#if defined (__cplusplus)
extern "C" {
#endif
#ifndef BENCH_ZSTD_H_3242387 #ifndef BENCH_ZSTD_H_3242387
#define BENCH_ZSTD_H_3242387 #define BENCH_ZSTD_H_3242387
@ -27,6 +23,10 @@ extern "C" {
#include "../lib/zstd.h" /* ZSTD_compressionParameters */ #include "../lib/zstd.h" /* ZSTD_compressionParameters */
#if defined (__cplusplus)
extern "C" {
#endif
/* === Constants === */ /* === Constants === */
#define MB_UNIT 1000000 #define MB_UNIT 1000000

8
programs/fileio_asyncio.h
View File

@ -22,10 +22,6 @@
#ifndef ZSTD_FILEIO_ASYNCIO_H #ifndef ZSTD_FILEIO_ASYNCIO_H
#define ZSTD_FILEIO_ASYNCIO_H #define ZSTD_FILEIO_ASYNCIO_H
#if defined (__cplusplus)
extern "C" {
#endif
#include "../lib/common/mem.h" /* U32, U64 */ #include "../lib/common/mem.h" /* U32, U64 */
#include "fileio_types.h" #include "fileio_types.h"
#include "platform.h" #include "platform.h"
@ -35,6 +31,10 @@ extern "C" {
#define MAX_IO_JOBS (10) #define MAX_IO_JOBS (10)
#if defined (__cplusplus)
extern "C" {
#endif
typedef struct { typedef struct {
/* These struct fields should be set only on creation and not changed afterwards */ /* These struct fields should be set only on creation and not changed afterwards */
POOL_ctx* threadPool; POOL_ctx* threadPool;

16
programs/fileio_common.h
View File

@ -11,15 +11,22 @@
#ifndef ZSTD_FILEIO_COMMON_H #ifndef ZSTD_FILEIO_COMMON_H
#define ZSTD_FILEIO_COMMON_H #define ZSTD_FILEIO_COMMON_H
#if defined (__cplusplus)
extern "C" {
#endif
#include "../lib/common/mem.h" /* U32, U64 */ #include "../lib/common/mem.h" /* U32, U64 */
#include "fileio_types.h" #include "fileio_types.h"
#include "platform.h" #include "platform.h"
#include "timefn.h" /* UTIL_getTime, UTIL_clockSpanMicro */ #include "timefn.h" /* UTIL_getTime, UTIL_clockSpanMicro */
#if !(defined(_MSC_VER) && _MSC_VER >= 1400) \
&& !(!defined(__64BIT__) && (PLATFORM_POSIX_VERSION >= 200112L)) \
&& !(defined(__MINGW32__) && !defined(__STRICT_ANSI__) && !defined(__NO_MINGW_LFS) && defined(__MSVCRT__)) \
&& (defined(_WIN32) && !defined(__DJGPP__))
# include <windows.h>
#endif
#if defined (__cplusplus)
extern "C" {
#endif
/*-************************************* /*-*************************************
* Macros * Macros
***************************************/ ***************************************/
@ -89,7 +96,6 @@ extern UTIL_time_t g_displayClock;
# define LONG_SEEK fseeko64 # define LONG_SEEK fseeko64
# define LONG_TELL ftello64 # define LONG_TELL ftello64
#elif defined(_WIN32) && !defined(__DJGPP__) #elif defined(_WIN32) && !defined(__DJGPP__)
# include <windows.h>
static int LONG_SEEK(FILE* file, __int64 offset, int origin) { static int LONG_SEEK(FILE* file, __int64 offset, int origin) {
LARGE_INTEGER off; LARGE_INTEGER off;
DWORD method; DWORD method;

21
programs/platform.h
View File

@ -11,12 +11,6 @@
#ifndef PLATFORM_H_MODULE #ifndef PLATFORM_H_MODULE
#define PLATFORM_H_MODULE #define PLATFORM_H_MODULE
#if defined (__cplusplus)
extern "C" {
#endif
/* ************************************** /* **************************************
* Compiler Options * Compiler Options
****************************************/ ****************************************/
@ -144,10 +138,20 @@ extern "C" {
# include <io.h> /* _isatty */ # include <io.h> /* _isatty */
# include <windows.h> /* DeviceIoControl, HANDLE, FSCTL_SET_SPARSE */ # include <windows.h> /* DeviceIoControl, HANDLE, FSCTL_SET_SPARSE */
# include <stdio.h> /* FILE */ # include <stdio.h> /* FILE */
#if defined (__cplusplus)
extern "C" {
#endif
static __inline int IS_CONSOLE(FILE* stdStream) { static __inline int IS_CONSOLE(FILE* stdStream) {
DWORD dummy; DWORD dummy;
return _isatty(_fileno(stdStream)) && GetConsoleMode((HANDLE)_get_osfhandle(_fileno(stdStream)), &dummy); return _isatty(_fileno(stdStream)) && GetConsoleMode((HANDLE)_get_osfhandle(_fileno(stdStream)), &dummy);
} }
#if defined (__cplusplus)
}
#endif
#else #else
# define IS_CONSOLE(stdStream) 0 # define IS_CONSOLE(stdStream) 0
#endif #endif
@ -210,9 +214,4 @@ static __inline int IS_CONSOLE(FILE* stdStream) {
# endif # endif
#endif #endif
#if defined (__cplusplus)
}
#endif
#endif /* PLATFORM_H_MODULE */ #endif /* PLATFORM_H_MODULE */

11
programs/timefn.h
View File

@ -11,12 +11,6 @@
#ifndef TIME_FN_H_MODULE_287987 #ifndef TIME_FN_H_MODULE_287987
#define TIME_FN_H_MODULE_287987 #define TIME_FN_H_MODULE_287987
#if defined (__cplusplus)
extern "C" {
#endif
/*-**************************************** /*-****************************************
* Types * Types
******************************************/ ******************************************/
@ -32,6 +26,11 @@ extern "C" {
typedef unsigned long long PTime; /* does not support compilers without long long support */ typedef unsigned long long PTime; /* does not support compilers without long long support */
#endif #endif
#if defined (__cplusplus)
extern "C" {
#endif
/* UTIL_time_t contains a nanosecond time counter. /* UTIL_time_t contains a nanosecond time counter.
* The absolute value is not meaningful. * The absolute value is not meaningful.
* It's only valid to compute the difference between 2 measurements. */ * It's only valid to compute the difference between 2 measurements. */

9
programs/util.c
View File

@ -8,11 +8,6 @@
* You may select, at your option, one of the above-listed licenses. * You may select, at your option, one of the above-listed licenses.
*/ */
#if defined (__cplusplus)
extern "C" {
#endif
/*-**************************************** /*-****************************************
* Dependencies * Dependencies
******************************************/ ******************************************/
@ -1646,7 +1641,3 @@ int UTIL_countLogicalCores(void)
{ {
return UTIL_countCores(1); return UTIL_countCores(1);
} }
#if defined (__cplusplus)
}
#endif

4
programs/util.h
View File

@ -20,6 +20,9 @@
#include <sys/types.h> /* stat, utime */ #include <sys/types.h> /* stat, utime */
#include <sys/stat.h> /* stat, chmod */ #include <sys/stat.h> /* stat, chmod */
#include "../lib/common/mem.h" /* U64 */ #include "../lib/common/mem.h" /* U64 */
#if not (defined(_MSC_VER) || defined(__MINGW32__) || defined (__MSVCRT__))
#include <libgen.h>
#endif
/*-************************************************************ /*-************************************************************
* Fix fseek()'s 2GiB barrier with MSVC, macOS, *BSD, MinGW * Fix fseek()'s 2GiB barrier with MSVC, macOS, *BSD, MinGW
@ -116,7 +119,6 @@ int UTIL_requireUserConfirmation(const char* prompt, const char* abortMsg, const
#define STRDUP(s) _strdup(s) #define STRDUP(s) _strdup(s)
#else #else
#define PATH_SEP '/' #define PATH_SEP '/'
#include <libgen.h>
#define STRDUP(s) strdup(s) #define STRDUP(s) strdup(s)
#endif #endif

10
zlibWrapper/zstd_zlibwrapper.h
View File

@ -11,11 +11,6 @@
#ifndef ZSTD_ZLIBWRAPPER_H #ifndef ZSTD_ZLIBWRAPPER_H
#define ZSTD_ZLIBWRAPPER_H #define ZSTD_ZLIBWRAPPER_H
#if defined (__cplusplus)
extern "C" {
#endif
#define ZLIB_CONST #define ZLIB_CONST
#define Z_PREFIX #define Z_PREFIX
#define ZLIB_INTERNAL /* disables gz*64 functions but fixes zlib 1.2.4 with Z_PREFIX */ #define ZLIB_INTERNAL /* disables gz*64 functions but fixes zlib 1.2.4 with Z_PREFIX */
@ -29,6 +24,11 @@ extern "C" {
#define _Z_OF OF #define _Z_OF OF
#endif #endif
#if defined (__cplusplus)
extern "C" {
#endif
/* returns a string with version of zstd library */ /* returns a string with version of zstd library */
const char * zstdVersion(void); const char * zstdVersion(void);