Fixed bug 3993 - altivec.h include in SDL_cpuinfo.h breaks compilation with -std=c++11

bastien.bouclet

According to this GCC bug report, altivec.h requires building with the gnu extensions: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78263.

As an application developer, I don't want SDL to force me to enable the gnu extensions.
This commit is contained in:
Sam Lantinga 2017-12-12 16:25:43 -08:00
parent ca7297668a
commit 0597bf6e99

View File

@ -51,30 +51,28 @@
#include <intrin.h> #include <intrin.h>
#else #else
#ifdef __ALTIVEC__ #ifdef __ALTIVEC__
#if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__) #if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__) && !defined(SDL_DISABLE_ALTIVEC_H)
#include <altivec.h> #include <altivec.h>
#undef pixel #undef pixel
#undef bool
#endif #endif
#endif #endif
#ifdef __3dNOW__ #if defined(__3dNOW__) && !defined(SDL_DISABLE_MM3DNOW_H)
#include <mm3dnow.h> #include <mm3dnow.h>
#endif #endif
#if HAVE_IMMINTRIN_H #if HAVE_IMMINTRIN_H && !defined(SDL_DISABLE_IMMINTRIN_H)
#include <immintrin.h> #include <immintrin.h>
#else #else
#ifdef __MMX__ #if defined(__MMX__) && !defined(SDL_DISABLE_MMINTRIN_H)
#include <mmintrin.h> #include <mmintrin.h>
#endif #endif
#ifdef __3dNOW__ #if defined(__SSE__) && !defined(SDL_DISABLE_XMMINTRIN_H)
#include <mm3dnow.h>
#endif
#ifdef __SSE__
#include <xmmintrin.h> #include <xmmintrin.h>
#endif #endif
#ifdef __SSE2__ #if defined(__SSE2__) && !defined(SDL_DISABLE_EMMINTRIN_H)
#include <emmintrin.h> #include <emmintrin.h>
#endif #endif
#ifdef __SSE3__ #if defined(__SSE3__) && !defined(SDL_DISABLE_PMMINTRIN_H)
#include <pmmintrin.h> #include <pmmintrin.h>
#endif #endif
#endif /* HAVE_IMMINTRIN_H */ #endif /* HAVE_IMMINTRIN_H */