Martin Storsjo
2017-Nov-03 10:03 UTC
[Speex-dev] [PATCH] Check for _WIN32 instead of WIN32 in preprocessor checks
_WIN32 is always defined by the compiler automatically when targeting
that platform, while WIN32 only is defined automatically in some
configurations, and e.g. in MSVC only ever is defined in project files
(if at all).
Some other checks in the codebase already check for both WIN32 and
_WIN32; those are left untouched.
---
include/speex/speex.h | 2 +-
libspeex/stack_alloc.h | 2 +-
src/skeleton.h | 2 +-
tmv/config.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/speex/speex.h b/include/speex/speex.h
index 28c4b44d..34919e2f 100644
--- a/include/speex/speex.h
+++ b/include/speex/speex.h
@@ -412,7 +412,7 @@ extern const SpeexMode * const
speex_mode_list[SPEEX_NB_MODES];
/** Obtain one of the modes available */
const SpeexMode * speex_lib_get_mode (int mode);
-#ifndef WIN32
+#ifndef _WIN32
/* We actually override the function in the narrowband case so that we can
avoid linking in the wideband stuff */
#define speex_lib_get_mode(mode) ((mode)==SPEEX_MODEID_NB ? &speex_nb_mode
: speex_lib_get_mode (mode))
#endif
diff --git a/libspeex/stack_alloc.h b/libspeex/stack_alloc.h
index 5264e666..f6eb3f6e 100644
--- a/libspeex/stack_alloc.h
+++ b/libspeex/stack_alloc.h
@@ -36,7 +36,7 @@
#define STACK_ALLOC_H
#ifdef USE_ALLOCA
-# ifdef WIN32
+# ifdef _WIN32
# include <malloc.h>
# else
# ifdef HAVE_ALLOCA_H
diff --git a/src/skeleton.h b/src/skeleton.h
index f07d7a3e..1559f8f5 100644
--- a/src/skeleton.h
+++ b/src/skeleton.h
@@ -10,7 +10,7 @@
extern "C" {
#endif
-#ifdef WIN32
+#ifdef _WIN32
#define snprintf _snprintf
#endif
diff --git a/tmv/config.h b/tmv/config.h
index ea7abe1d..df61d4d0 100644
--- a/tmv/config.h
+++ b/tmv/config.h
@@ -4,7 +4,7 @@
#define USE_COMPACT_KISS_FFT
//#define USE_KISS_FFT
-#ifdef WIN32
+#ifdef _WIN32
//#define FIXED_POINT
--
2.13.6 (Apple Git-96)
Tristan Matthews
2017-Nov-03 14:51 UTC
[Speex-dev] [PATCH] Check for _WIN32 instead of WIN32 in preprocessor checks
On Fri, Nov 3, 2017 at 6:03 AM, Martin Storsjo <martin at martin.st> wrote:> _WIN32 is always defined by the compiler automatically when targeting > that platform, while WIN32 only is defined automatically in some > configurations, and e.g. in MSVC only ever is defined in project files > (if at all). > > Some other checks in the codebase already check for both WIN32 and > _WIN32; those are left untouched.Applied, thanks. Best, Tristan> --- > include/speex/speex.h | 2 +- > libspeex/stack_alloc.h | 2 +- > src/skeleton.h | 2 +- > tmv/config.h | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/speex/speex.h b/include/speex/speex.h > index 28c4b44d..34919e2f 100644 > --- a/include/speex/speex.h > +++ b/include/speex/speex.h > @@ -412,7 +412,7 @@ extern const SpeexMode * const speex_mode_list[SPEEX_NB_MODES]; > /** Obtain one of the modes available */ > const SpeexMode * speex_lib_get_mode (int mode); > > -#ifndef WIN32 > +#ifndef _WIN32 > /* We actually override the function in the narrowband case so that we can avoid linking in the wideband stuff */ > #define speex_lib_get_mode(mode) ((mode)==SPEEX_MODEID_NB ? &speex_nb_mode : speex_lib_get_mode (mode)) > #endif > diff --git a/libspeex/stack_alloc.h b/libspeex/stack_alloc.h > index 5264e666..f6eb3f6e 100644 > --- a/libspeex/stack_alloc.h > +++ b/libspeex/stack_alloc.h > @@ -36,7 +36,7 @@ > #define STACK_ALLOC_H > > #ifdef USE_ALLOCA > -# ifdef WIN32 > +# ifdef _WIN32 > # include <malloc.h> > # else > # ifdef HAVE_ALLOCA_H > diff --git a/src/skeleton.h b/src/skeleton.h > index f07d7a3e..1559f8f5 100644 > --- a/src/skeleton.h > +++ b/src/skeleton.h > @@ -10,7 +10,7 @@ > extern "C" { > #endif > > -#ifdef WIN32 > +#ifdef _WIN32 > #define snprintf _snprintf > #endif > > diff --git a/tmv/config.h b/tmv/config.h > index ea7abe1d..df61d4d0 100644 > --- a/tmv/config.h > +++ b/tmv/config.h > @@ -4,7 +4,7 @@ > #define USE_COMPACT_KISS_FFT > //#define USE_KISS_FFT > > -#ifdef WIN32 > +#ifdef _WIN32 > > //#define FIXED_POINT > > -- > 2.13.6 (Apple Git-96) > > _______________________________________________ > Speex-dev mailing list > Speex-dev at xiph.org > http://lists.xiph.org/mailman/listinfo/speex-dev