merged zbuff_static.h into zbuff.h . Now requires ZBUFF_STATIC_LINKING_ONLY macro

programs/fileio.c

@@ -58,7 +58,8 @@
 #include "fileio.h"
 #include "zstd_static.h"   /* ZSTD_magicNumber, ZSTD_frameHeaderSize_max */
 #include "zstd_internal.h" /* MIN, KB, MB */
-#include "zbuff_static.h"
+#define ZBUFF_STATIC_LINKING_ONLY
+#include "zbuff.h"
 
 #if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT==1)
 #  include "zstd_legacy.h"    /* ZSTD_isLegacy */

programs/zbufftest.c

@@ -40,12 +40,12 @@
 #include <sys/timeb.h>    /* timeb */
 #include <string.h>       /* strcmp */
 #include "mem.h"
-#include "zbuff.h"
 #include "zstd_static.h"  /* ZSTD_compressBound(), ZSTD_maxCLevel() */
-#include "zbuff_static.h" /* ZBUFF_createCCtx_advanced */
+#define ZBUFF_STATIC_LINKING_ONLY
+#include "zbuff.h"        /* ZBUFF_createCCtx_advanced */
 #include "datagen.h"      /* RDG_genBuffer */
 #define XXH_STATIC_LINKING_ONLY
-#include "xxhash.h"       /* XXH64 */
+#include "xxhash.h"       /* XXH64_* */
 
 
 /*-************************************