From ec494c0139999ba361c38016b18b811e60dd25df Mon Sep 17 00:00:00 2001 From: Pere Pujal i Carabantes Date: Tue, 5 Mar 2019 22:43:31 +0100 Subject: [PATCH] Adding SDL2 renamed guard header names. --- src/tuxpaint.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 09b2f28af..c9efe1cee 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -384,7 +384,7 @@ static void mtw(wchar_t * wtok, char *tok) #include "SDL2/SDL.h" #include "SDL2/SDL_thread.h" -#if !defined(_SDL_H) +#if !defined(_SDL_H) && !defined(SDL_h_) #error "---------------------------------------------------" #error "If you installed SDL from a package, be sure to get" #error "the development package, as well!" @@ -394,7 +394,7 @@ static void mtw(wchar_t * wtok, char *tok) #include "SDL2/SDL_image.h" -#if !defined(_SDL_IMAGE_H) && !defined(_IMG_h) +#if !defined(_SDL_IMAGE_H) && !defined(_IMG_h) && !defined(SDL_IMAGE_H_) #error "---------------------------------------------------" #error "If you installed SDL_image from a package, be sure" #error "to get the development package, as well!" @@ -404,7 +404,7 @@ static void mtw(wchar_t * wtok, char *tok) #include "SDL2/SDL_ttf.h" -#if !defined(_SDL_TTF_H) && !defined(_SDLttf_h) +#if !defined(_SDL_TTF_H) && !defined(_SDLttf_h) && !defined(SDL_TTF_H_) #error "---------------------------------------------------" #error "If you installed SDL_ttf from a package, be sure" #error "to get the development package, as well!" @@ -450,7 +450,7 @@ static void mtw(wchar_t * wtok, char *tok) #include "SDL2/SDL_mixer.h" -#if !defined(_SDL_MIXER_H) && !defined(_MIXER_H_) +#if !defined(_SDL_MIXER_H) && !defined(_MIXER_H_) && !defined(SDL_MIXER_H_) #error "---------------------------------------------------" #error "If you installed SDL_mixer from a package, be sure" #error "to get the development package, as well!"