aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2014-12-24 17:15:50 -0800
committerChris Robinson <[email protected]>2014-12-24 17:15:50 -0800
commit4dc9956a12881d282bdc499b89d8619d8e7d08e2 (patch)
tree63599949f344b24ef7c862afa1e7bb0e4c38ac18
parentbc17d6fc45ccf98e3b62e4c6b5b6046bf6255d2f (diff)
Remove some IN_IDE_PARSER uses
-rw-r--r--Alc/mixer_sse.c7
-rw-r--r--OpenAL32/Include/alMain.h7
-rw-r--r--config.h.in2
-rw-r--r--include/align.h6
4 files changed, 4 insertions, 18 deletions
diff --git a/Alc/mixer_sse.c b/Alc/mixer_sse.c
index 4dfc748d..31c57588 100644
--- a/Alc/mixer_sse.c
+++ b/Alc/mixer_sse.c
@@ -1,12 +1,5 @@
#include "config.h"
-#ifdef IN_IDE_PARSER
-/* KDevelop's parser won't recognize these defines that get added by the -msse
- * switch used to compile this source. Without them, xmmintrin.h fails to
- * declare anything. */
-#define __MMX__
-#define __SSE__
-#endif
#include <xmmintrin.h>
#include "AL/al.h"
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 9dcaa29b..3a79a91b 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -255,13 +255,6 @@ ALC_API void ALC_APIENTRY alcGetInteger64vSOFT(ALCdevice *device, ALCenum pname,
#endif
-#ifdef IN_IDE_PARSER
-/* KDevelop's parser doesn't recognize the C99-standard restrict keyword, but
- * recent versions (at least 4.5.1) do recognize GCC's __restrict. */
-#define restrict __restrict
-#endif
-
-
typedef ALint64SOFT ALint64;
typedef ALuint64SOFT ALuint64;
diff --git a/config.h.in b/config.h.in
index f999eb49..817e1691 100644
--- a/config.h.in
+++ b/config.h.in
@@ -9,7 +9,7 @@
/* KDevelop's parser doesn't recognize the C99-standard restrict keyword, but
* recent versions (at least 4.5.1) do recognize GCC's __restrict. */
#define restrict __restrict
-#endif
+#endif
/* Define any available alignment declaration */
#define ALIGN(x) ${ALIGN_DECL}
diff --git a/include/align.h b/include/align.h
index be01f4e4..e2dc81df 100644
--- a/include/align.h
+++ b/include/align.h
@@ -6,11 +6,11 @@
#endif
#ifndef alignas
-#ifdef HAVE_C11_ALIGNAS
-#define alignas _Alignas
-#elif defined(IN_IDE_PARSER)
+#if defined(IN_IDE_PARSER)
/* KDevelop has problems with our align macro, so just use nothing for parsing. */
#define alignas(x)
+#elif defined(HAVE_C11_ALIGNAS)
+#define alignas _Alignas
#else
/* NOTE: Our custom ALIGN macro can't take a type name like alignas can. For
* maximum compatibility, only provide constant integer values to alignas. */