commit b09ec5c2b9b19a76e7c8beb1bc3e63af343d695d
author Nick Terrell <terrelln@fb.com> Thu Sep 24 14:13:16 2020 -0700
committer Nick Terrell <terrelln@fb.com> Thu Sep 24 15:51:04 2020 -0700
tree 307b2cec524b95be1574ff47ff3cd42a977e8832
parent 9009b59f096f9a55adda4062be5e08d8cecf9ffb

Remove MEM_STATIC_ASSERT and use DEBUG_STATIC_ASSERT instead

lib/common/bitstream.h

diff --git a/lib/common/bitstream.h b/lib/common/bitstream.h
index c749185..d9a2730 100644
--- a/lib/common/bitstream.h
+++ b/lib/common/bitstream.h
@@ -203,7 +203,7 @@
 MEM_STATIC void BIT_addBits(BIT_CStream_t* bitC,
                             size_t value, unsigned nbBits)
 {
-    MEM_STATIC_ASSERT(BIT_MASK_SIZE == 32);
+    DEBUG_STATIC_ASSERT(BIT_MASK_SIZE == 32);
     assert(nbBits < BIT_MASK_SIZE);
     assert(nbBits + bitC->bitPos < sizeof(bitC->bitContainer) * 8);
     bitC->bitContainer |= (value & BIT_mask[nbBits]) << bitC->bitPos;

lib/common/mem.h

diff --git a/lib/common/mem.h b/lib/common/mem.h
index 32da28b..2d7e9e7 100644
--- a/lib/common/mem.h
+++ b/lib/common/mem.h
@@ -18,6 +18,7 @@
 /*-****************************************
 *  Dependencies
 ******************************************/
+#include "debug.h"  /* DEBUG_STATIC_ASSERT */
 #include "zstd_deps.h"  /* size_t, ptrdiff_t, ZSTD_memcpy */
 
 
@@ -43,8 +44,7 @@
 #endif
 
 /* code only tested on 32 and 64 bits systems */
-#define MEM_STATIC_ASSERT(c)   { enum { MEM_static_assert = 1/(int)(!!(c)) }; }
-MEM_STATIC void MEM_check(void) { MEM_STATIC_ASSERT((sizeof(size_t)==4) || (sizeof(size_t)==8)); }
+MEM_STATIC void MEM_check(void) { DEBUG_STATIC_ASSERT((sizeof(size_t)==4) || (sizeof(size_t)==8)); }
 
 /* detects whether we are being compiled under msan */
 #if defined (__has_feature)

zlibWrapper/zstd_zlibwrapper.c

diff --git a/zlibWrapper/zstd_zlibwrapper.c b/zlibWrapper/zstd_zlibwrapper.c
index b4c9588..28a53b6 100644
--- a/zlibWrapper/zstd_zlibwrapper.c
+++ b/zlibWrapper/zstd_zlibwrapper.c
@@ -457,7 +457,7 @@
 static ZWRAP_DCtx* ZWRAP_createDCtx(z_streamp strm)
 {
     ZWRAP_DCtx* zwd;
-    MEM_STATIC_ASSERT(sizeof(zwd->headerBuf) >= ZSTD_HEADERSIZE);   /* check static buffer size condition */
+    DEBUG_STATIC_ASSERT(sizeof(zwd->headerBuf) >= ZSTD_HEADERSIZE);   /* check static buffer size condition */
 
     if (strm->zalloc && strm->zfree) {
         zwd = (ZWRAP_DCtx*)strm->zalloc(strm->opaque, 1, sizeof(ZWRAP_DCtx));