From: Nick Terrell <terrelln@fb.com>
Date: Thu, 24 Sep 2020 21:13:16 +0000 (-0700)
Subject: Remove MEM_STATIC_ASSERT and use DEBUG_STATIC_ASSERT instead
X-Git-Tag: v1.4.7~69^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b09ec5c2b9b19a76e7c8beb1bc3e63af343d695d;p=thirdparty%2Fzstd.git

Remove MEM_STATIC_ASSERT and use DEBUG_STATIC_ASSERT instead
---

diff --git a/lib/common/bitstream.h b/lib/common/bitstream.h
index c74918502..d9a273010 100644
--- a/lib/common/bitstream.h
+++ b/lib/common/bitstream.h
@@ -203,7 +203,7 @@ MEM_STATIC size_t BIT_initCStream(BIT_CStream_t* bitC,
 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;
diff --git a/lib/common/mem.h b/lib/common/mem.h
index 32da28b85..2d7e9e7e4 100644
--- a/lib/common/mem.h
+++ b/lib/common/mem.h
@@ -18,6 +18,7 @@ extern "C" {
 /*-****************************************
 *  Dependencies
 ******************************************/
+#include "debug.h"  /* DEBUG_STATIC_ASSERT */
 #include "zstd_deps.h"  /* size_t, ptrdiff_t, ZSTD_memcpy */
 
 
@@ -43,8 +44,7 @@ extern "C" {
 #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)
diff --git a/zlibWrapper/zstd_zlibwrapper.c b/zlibWrapper/zstd_zlibwrapper.c
index b4c958880..28a53b618 100644
--- a/zlibWrapper/zstd_zlibwrapper.c
+++ b/zlibWrapper/zstd_zlibwrapper.c
@@ -457,7 +457,7 @@ static void ZWRAP_initDCtx(ZWRAP_DCtx* zwd)
 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));