]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge pull request #4218 from facebook/externC
authorVictor Zhang <csv@meta.com>
Tue, 7 Jan 2025 18:06:08 +0000 (10:06 -0800)
committerGitHub <noreply@github.com>
Tue, 7 Jan 2025 18:06:08 +0000 (10:06 -0800)
Move #includes out of `extern "C"` blocks

13 files changed:
1  2 
lib/common/zstd_internal.h
lib/common/zstd_trace.h
lib/compress/zstd_compress_internal.h
lib/compress/zstd_double_fast.h
lib/compress/zstd_fast.h
lib/compress/zstd_lazy.h
lib/compress/zstd_ldm.h
lib/compress/zstd_opt.h
lib/zstd.h
programs/benchzstd.h
programs/fileio.h
programs/fileio_common.h
programs/util.h

Simple merge
Simple merge
Simple merge
Simple merge
index f7fbf4f683c8e99d5c0a8e92d3f911a2fc37d2c3,8bbed8f9711f9a578037ff4437e0c23f3374c9d0..216821ac33bf2f662d642d306fbeea9d7de7a0ee
@@@ -22,17 -18,13 +18,13 @@@ void ZSTD_fillHashTable(ZSTD_MatchState
                          void const* end, ZSTD_dictTableLoadMethod_e dtlm,
                          ZSTD_tableFillPurpose_e tfp);
  size_t ZSTD_compressBlock_fast(
 -        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
 +        ZSTD_MatchState_t* ms, SeqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
          void const* src, size_t srcSize);
  size_t ZSTD_compressBlock_fast_dictMatchState(
 -        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
 +        ZSTD_MatchState_t* ms, SeqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
          void const* src, size_t srcSize);
  size_t ZSTD_compressBlock_fast_extDict(
 -        ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
 +        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 */
Simple merge
Simple merge
Simple merge
diff --cc lib/zstd.h
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc programs/util.h
Simple merge