diff --git a/gb.sdl/src/Cdraw.cpp b/gb.sdl/src/Cdraw.cpp index d65c99a43..8d4578696 100644 --- a/gb.sdl/src/Cdraw.cpp +++ b/gb.sdl/src/Cdraw.cpp @@ -55,7 +55,7 @@ static CFONT *get_default_font() static bool check_graphic(void) { - if (UNLIKELY(THIS == NULL)) + if (THIS == NULL) { GB.Error("No device"); return true; diff --git a/gb.sdl/src/Cjoystick.cpp b/gb.sdl/src/Cjoystick.cpp index 346d0ff0d..a2e076b68 100644 --- a/gb.sdl/src/Cjoystick.cpp +++ b/gb.sdl/src/Cjoystick.cpp @@ -46,7 +46,7 @@ static int joyindex = 0; CJOY_INFO CJOY_info = { 0 }; #define CHECK_VALID() \ - if (UNLIKELY(!CJOY_info.valid)) \ + if (!CJOY_info.valid) \ { \ GB.Error("No joystick event data"); \ return; \ diff --git a/gb.sdl/src/Cmouse.cpp b/gb.sdl/src/Cmouse.cpp index 88d4d0e86..8ffcb47bc 100644 --- a/gb.sdl/src/Cmouse.cpp +++ b/gb.sdl/src/Cmouse.cpp @@ -35,7 +35,7 @@ CMOUSE_INFO CMOUSE_info = { 0 }; #define CHECK_VALID() \ - if (UNLIKELY(!CMOUSE_info.valid)) \ + if (!CMOUSE_info.valid) \ { \ GB.Error("No mouse event data"); \ return; \ diff --git a/gb.sdl/src/SDLfont.cpp b/gb.sdl/src/SDLfont.cpp index df6211583..54409e2a2 100644 --- a/gb.sdl/src/SDLfont.cpp +++ b/gb.sdl/src/SDLfont.cpp @@ -348,7 +348,7 @@ void SDLfont::OpenFont(const char* file) hSDLfont = TTF_OpenFont(file, hfontsize); - if (UNLIKELY(hSDLfont == NULL)) + if (hSDLfont == NULL) SDLerror::RaiseError(TTF_GetError()); } #if 0