diff options
| author | sezero <sezero@users.sourceforge.net> | 2018-11-10 17:00:02 +0300 |
|---|---|---|
| committer | Thomas Daede <daede003@umn.edu> | 2019-01-28 16:43:52 -0800 |
| commit | 506a1b32cc4e83f41df8c6e7ca5bdc4bb3dec002 (patch) | |
| tree | 51c39adbf647898a2dc383ae06388c44e839d733 | |
| parent | 74556072244b743d658a1105b539bc773e3ed26f (diff) | |
| download | libvorbis-git-506a1b32cc4e83f41df8c6e7ca5bdc4bb3dec002.tar.gz | |
os.h: cleanup the _MSC_VER cpp checks mess.
| -rw-r--r-- | lib/os.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -119,8 +119,7 @@ static inline int vorbis_ftoi(double f){ /* yes, double! Otherwise, /* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the * 64 bit compiler and doesn't work on arm. */ -#if defined(_MSC_VER) && !defined(_WIN64) && \ - !defined(_WIN32_WCE) && !defined(_M_ARM) && !defined(_M_ARM64) +#if defined(_MSC_VER) && defined(_M_IX86) && !defined(_WIN32_WCE) # define VORBIS_FPU_CONTROL typedef ogg_int16_t vorbis_fpu_control; @@ -147,7 +146,7 @@ static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){ /* Optimized code path for x86_64 builds. Uses SSE2 intrinsics. This can be done safely because all x86_64 CPUs supports SSE2. */ -#if (defined(_MSC_VER) && defined(_WIN64)) || (defined(__GNUC__) && defined (__SSE2_MATH__)) +#if (defined(_MSC_VER) && defined(_M_X64)) || (defined(__GNUC__) && defined (__SSE2_MATH__)) # define VORBIS_FPU_CONTROL typedef ogg_int16_t vorbis_fpu_control; |