[FFmpeg-cvslog] x86/intreadwrite.h: add missing preprocessor checks

James Almer git at videolan.org
Wed Jul 10 19:49:40 EEST 2024


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Jul 10 13:48:42 2024 -0300| [15056dd65026023352069f58403c997be7fb9496] | committer: James Almer

x86/intreadwrite.h: add missing preprocessor checks

Removed by accident in the previous commits. This makes the code only run when
compiled with GCC and Clang like before. Support for other compilers like msvc
can be added later.

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15056dd65026023352069f58403c997be7fb9496
---

 libavutil/x86/intreadwrite.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavutil/x86/intreadwrite.h b/libavutil/x86/intreadwrite.h
index 6546eb016c..fd21143dd9 100644
--- a/libavutil/x86/intreadwrite.h
+++ b/libavutil/x86/intreadwrite.h
@@ -22,16 +22,16 @@
 #define AVUTIL_X86_INTREADWRITE_H
 
 #include <stdint.h>
-#if HAVE_INTRINSICS_SSE
+#if HAVE_INTRINSICS_SSE && defined(__SSE__)
 #include <immintrin.h>
 #endif
-#if HAVE_INTRINSICS_SSE2
+#if HAVE_INTRINSICS_SSE2 && defined(__SSE2__)
 #include <emmintrin.h>
 #endif
 #include "config.h"
 #include "libavutil/attributes.h"
 
-#if HAVE_INTRINSICS_SSE
+#if HAVE_INTRINSICS_SSE && defined(__SSE__)
 
 #define AV_COPY128 AV_COPY128
 static av_always_inline void AV_COPY128(void *d, const void *s)
@@ -40,9 +40,9 @@ static av_always_inline void AV_COPY128(void *d, const void *s)
     _mm_store_ps(d, tmp);
 }
 
-#endif /* HAVE_INTRINSICS_SSE */
+#endif /* HAVE_INTRINSICS_SSE && defined(__SSE__) */
 
-#if HAVE_INTRINSICS_SSE2
+#if HAVE_INTRINSICS_SSE2 && defined(__SSE2__)
 
 #define AV_ZERO128 AV_ZERO128
 static av_always_inline void AV_ZERO128(void *d)
@@ -51,6 +51,6 @@ static av_always_inline void AV_ZERO128(void *d)
     _mm_store_si128(d, zero);
 }
 
-#endif /* HAVE_INTRINSICS_SSE2 */
+#endif /* HAVE_INTRINSICS_SSE2 && defined(__SSE2__) */
 
 #endif /* AVUTIL_X86_INTREADWRITE_H */



More information about the ffmpeg-cvslog mailing list