commit b8a30c99d00558a81ccf2601db381d13ed11a303
author John Stiles <johnstiles@google.com> Wed Nov 22 11:30:14 2023 -0500
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Wed Nov 22 16:42:46 2023 +0000
tree 5136c5dd0be2586a2428ee34da857d0e2cefe18d
parent 8a5b9cb3ff9cd17b021668861c392e25765106ae

Improve Emscripten detection.

__EMSCRIPTEN_major__ is only guaranteed to be defined if
the program #includes "emscripten/version.h", but
__EMSCRIPTEN__ should always be defined:

https://emscripten.org/docs/compiling/Building-Projects.html#detecting-emscripten-in-preprocessor

Bug: b/305974160
Change-Id: I831620d50a216850b175f6f6f25988f25355e06f
Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/782438
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/skcms_internals.h

diff --git a/src/skcms_internals.h b/src/skcms_internals.h
index b5b72fe..028f78d 100644
--- a/src/skcms_internals.h
+++ b/src/skcms_internals.h
@@ -32,7 +32,7 @@
         // Tail-calls are a fairly new, optional feature in wasm and won't work everywhere.
         #if __has_cpp_attribute(clang::musttail) && !__has_feature(memory_sanitizer) \
                                                  && !__has_feature(address_sanitizer) \
-                                                 && !defined(__EMSCRIPTEN_major__) \
+                                                 && !defined(__EMSCRIPTEN__) \
                                                  && !defined(__ANDROID__)
             #define SKCMS_MUSTTAIL [[clang::musttail]]
         #else
@@ -72,7 +72,7 @@
 // If this isn't Clang, GCC, or Emscripten with SIMD support, we are in SKCMS_PORTABLE mode.
 #if !defined(SKCMS_PORTABLE) && !(defined(__clang__) || \
                                   defined(__GNUC__) || \
-                                  (defined(__EMSCRIPTEN_major__) && defined(__wasm_simd128__)))
+                                  (defined(__EMSCRIPTEN__) && defined(__wasm_simd128__)))
     #define SKCMS_PORTABLE 1
 #endif