Browse Source

use SDL_COMPILE_TIME_ASSERT instead of SDL_STATIC_ASSERT

pionere 3 years ago
parent
commit
014e2bbdb2
2 changed files with 1 additions and 2 deletions
  1. 0 1
      include/SDL_assert.h
  2. 1 1
      src/video/windows/SDL_windowswindow.c

+ 0 - 1
include/SDL_assert.h

@@ -76,7 +76,6 @@ assert can have unique static variables associated with it.
 #endif
 #define SDL_FILE    __FILE__
 #define SDL_LINE    __LINE__
-#define SDL_STATIC_ASSERT(COND,MSG) typedef char static_assertion_##MSG[(COND)?1:-1];
 
 /*
 sizeof (x) makes the compiler still parse the expression even without

+ 1 - 1
src/video/windows/SDL_windowswindow.c

@@ -448,7 +448,7 @@ WIN_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
     SDL_bool isstack;
 
     /* Create temporary buffer for ICONIMAGE structure */
-    SDL_STATIC_ASSERT(sizeof(BITMAPINFOHEADER) == 40, WIN_SetWindowIcon_uses_BITMAPINFOHEADER_to_prepare_an_ICONIMAGE);
+    SDL_COMPILE_TIME_ASSERT(WIN_SetWindowIcon_uses_BITMAPINFOHEADER_to_prepare_an_ICONIMAGE, sizeof(BITMAPINFOHEADER) == 40);
     mask_len = (icon->h * (icon->w + 7)/8);
     icon_len = sizeof(BITMAPINFOHEADER) + icon->h * icon->w * sizeof(Uint32) + mask_len;
     icon_bmp = SDL_small_alloc(BYTE, icon_len, &isstack);