lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-08-08 17:22:10 +03:00
Code Activity

Also Move programs/ Directory to Relative Includes

Browse Source
This commit is contained in:
W. Felix Handte
2020-05-01 16:20:40 -04:00
parent 6028827fee
commit 7dcca6bc64
10 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
programs/Makefile
View File

@@ -43,9 +43,7 @@ else
ALIGN_LOOP = ALIGN_LOOP =
endif endif
CPPFLAGS+= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/compress \ CPPFLAGS+= -DXXH_NAMESPACE=ZSTD_
-I$(ZSTDDIR)/dictBuilder \
-DXXH_NAMESPACE=ZSTD_
ifeq ($(OS),Windows_NT) # MinGW assumed ifeq ($(OS),Windows_NT) # MinGW assumed
CPPFLAGS += -D__USE_MINGW_ANSI_STDIO # compatibility with %zu formatting CPPFLAGS += -D__USE_MINGW_ANSI_STDIO # compatibility with %zu formatting
endif endif
@@ -72,7 +70,6 @@ ifneq ($(ZSTD_LEGACY_SUPPORT), 0)
ifeq ($(shell test $(ZSTD_LEGACY_SUPPORT) -lt 8; echo $$?), 0) ifeq ($(shell test $(ZSTD_LEGACY_SUPPORT) -lt 8; echo $$?), 0)
ZSTDLEGACY_FILES += $(shell ls $(ZSTDDIR)/legacy/*.c | $(GREP) 'v0[$(ZSTD_LEGACY_SUPPORT)-7]') ZSTDLEGACY_FILES += $(shell ls $(ZSTDDIR)/legacy/*.c | $(GREP) 'v0[$(ZSTD_LEGACY_SUPPORT)-7]')
endif endif
CPPFLAGS += -I$(ZSTDDIR)/legacy
else else
endif endif

8
programs/benchzstd.c
View File

@@ -30,13 +30,13 @@
#include "timefn.h" /* UTIL_time_t */ #include "timefn.h" /* UTIL_time_t */
#include "benchfn.h" #include "benchfn.h"
#include "mem.h" #include "../lib/common/mem.h"
#define ZSTD_STATIC_LINKING_ONLY #define ZSTD_STATIC_LINKING_ONLY
#include "zstd.h" #include "../lib/zstd.h"
#include "datagen.h" /* RDG_genBuffer */ #include "datagen.h" /* RDG_genBuffer */
#include "xxhash.h" #include "../lib/common/xxhash.h"
#include "benchzstd.h" #include "benchzstd.h"
#include "zstd_errors.h" #include "../lib/common/zstd_errors.h"
/* ************************************* /* *************************************

2
programs/benchzstd.h
View File

@@ -24,7 +24,7 @@ extern "C" {
/* === Dependencies === */ /* === Dependencies === */
#include <stddef.h> /* size_t */ #include <stddef.h> /* size_t */
#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_compressionParameters */ #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_compressionParameters */
#include "zstd.h" /* ZSTD_compressionParameters */ #include "../lib/zstd.h" /* ZSTD_compressionParameters */
/* === Constants === */ /* === Constants === */

2
programs/datagen.c
View File

@@ -18,7 +18,7 @@
#include <stdlib.h> /* malloc, free */ #include <stdlib.h> /* malloc, free */
#include <stdio.h> /* FILE, fwrite, fprintf */ #include <stdio.h> /* FILE, fwrite, fprintf */
#include <string.h> /* memcpy */ #include <string.h> /* memcpy */
#include "mem.h" /* U32 */ #include "../lib/common/mem.h" /* U32 */
/*-************************************ /*-************************************

4
programs/dibio.c
View File

@@ -30,8 +30,8 @@
#include <assert.h> #include <assert.h>
#include "timefn.h" /* UTIL_time_t, UTIL_clockSpanMicro, UTIL_getTime */ #include "timefn.h" /* UTIL_time_t, UTIL_clockSpanMicro, UTIL_getTime */
#include "mem.h" /* read */ #include "../lib/common/mem.h" /* read */
#include "error_private.h" #include "../lib/common/error_private.h"
#include "dibio.h" #include "dibio.h"

2
programs/dibio.h
View File

@@ -19,7 +19,7 @@
* Dependencies * Dependencies
***************************************/ ***************************************/
#define ZDICT_STATIC_LINKING_ONLY #define ZDICT_STATIC_LINKING_ONLY
#include "zdict.h" /* ZDICT_params_t */ #include "../lib/dictBuilder/zdict.h" /* ZDICT_params_t */
/*-************************************* /*-*************************************

8
programs/fileio.c
View File

@@ -39,13 +39,13 @@
# include <io.h> # include <io.h>
#endif #endif
#include "mem.h" /* U32, U64 */ #include "../lib/common/mem.h" /* U32, U64 */
#include "fileio.h" #include "fileio.h"
#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_magicNumber, ZSTD_frameHeaderSize_max */ #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_magicNumber, ZSTD_frameHeaderSize_max */
#include "zstd.h" #include "../lib/zstd.h"
#include "zstd_errors.h" /* ZSTD_error_frameParameter_windowTooLarge */ #include "../lib/common/zstd_errors.h" /* ZSTD_error_frameParameter_windowTooLarge */
#include "zstd_compress_internal.h" #include "../lib/compress/zstd_compress_internal.h"
#if defined(ZSTD_GZCOMPRESS) || defined(ZSTD_GZDECOMPRESS) #if defined(ZSTD_GZCOMPRESS) || defined(ZSTD_GZDECOMPRESS)
# include <zlib.h> # include <zlib.h>

2
programs/fileio.h
View File

@@ -13,7 +13,7 @@
#define FILEIO_H_23981798732 #define FILEIO_H_23981798732
#define ZSTD_STATIC_LINKING_ONLY /* ZSTD_compressionParameters */ #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_compressionParameters */
#include "zstd.h" /* ZSTD_* */ #include "../lib/zstd.h" /* ZSTD_* */
#if defined (__cplusplus) #if defined (__cplusplus)
extern "C" { extern "C" {

2
programs/util.h
View File

@@ -23,7 +23,7 @@ extern "C" {
#include <stddef.h> /* size_t, ptrdiff_t */ #include <stddef.h> /* size_t, ptrdiff_t */
#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 "mem.h" /* U64 */ #include "../lib/common/mem.h" /* U64 */
/*-************************************************************ /*-************************************************************

2
programs/zstdcli.c
View File

@@ -40,7 +40,7 @@
#ifndef ZSTD_NODICT #ifndef ZSTD_NODICT
# include "dibio.h" /* ZDICT_cover_params_t, DiB_trainFromFiles() */ # include "dibio.h" /* ZDICT_cover_params_t, DiB_trainFromFiles() */
#endif #endif
#include "zstd.h" /* ZSTD_VERSION_STRING, ZSTD_minCLevel, ZSTD_maxCLevel */ #include "../lib/zstd.h" /* ZSTD_VERSION_STRING, ZSTD_minCLevel, ZSTD_maxCLevel */
/*-************************************ /*-************************************