[EH] __USING_EMSCRIPTEN_EXCEPTIONS__ -> __EMSCRIPTEN_EXCEPTIONS__ (#2…

…1972) In line with #21970.
emscripten-core · May 21, 2024 · f969e30 · f969e30
1 parent cada1eb
commit f969e30
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/system/lib/libcxxabi/src/cxa_exception.h b/system/lib/libcxxabi/src/cxa_exception.h
@@ -19,7 +19,7 @@
 
 namespace __cxxabiv1 {
 
-#ifdef __USING_EMSCRIPTEN_EXCEPTIONS__
+#ifdef __EMSCRIPTEN_EXCEPTIONS__
 
 struct _LIBCXXABI_HIDDEN __cxa_exception {
   size_t referenceCount;
@@ -184,7 +184,7 @@ extern "C" _LIBCXXABI_FUNC_VIS __cxa_eh_globals * __cxa_get_globals_fast ();
 extern "C" _LIBCXXABI_FUNC_VIS void * __cxa_allocate_dependent_exception ();
 extern "C" _LIBCXXABI_FUNC_VIS void __cxa_free_dependent_exception (void * dependent_exception);
 
-#endif // !__USING_EMSCRIPTEN_EXCEPTIONS__
+#endif // !__EMSCRIPTEN_EXCEPTIONS__
 
 }  // namespace __cxxabiv1
 

diff --git a/system/lib/libcxxabi/src/cxa_handlers.cpp b/system/lib/libcxxabi/src/cxa_handlers.cpp
@@ -73,7 +73,7 @@ __attribute__((noreturn))
 void
 terminate() noexcept
 {
-#if !defined(_LIBCXXABI_NO_EXCEPTIONS) && !defined(__USING_EMSCRIPTEN_EXCEPTIONS__)
+#if !defined(_LIBCXXABI_NO_EXCEPTIONS) && !defined(__EMSCRIPTEN_EXCEPTIONS__)
     // If there might be an uncaught exception
     using namespace __cxxabiv1;
     __cxa_eh_globals* globals = __cxa_get_globals_fast();

diff --git a/system/lib/libcxxabi/src/private_typeinfo.cpp b/system/lib/libcxxabi/src/private_typeinfo.cpp
@@ -1560,6 +1560,6 @@ int __cxa_is_pointer_type(__shim_type_info* type) {
 }
 
 }
-#endif // __USING_EMSCRIPTEN_EXCEPTIONS__
+#endif // __EMSCRIPTEN_EXCEPTIONS__
 
 }  // __cxxabiv1
diff --git a/tools/maint/gen_struct_info.py b/tools/maint/gen_struct_info.py
@@ -415,7 +415,7 @@ def main(args):
 
   cxxflags = [
     '-I' + utils.path_from_root('system/lib/libcxxabi/src'),
-    '-D__USING_EMSCRIPTEN_EXCEPTIONS__',
+    '-D__EMSCRIPTEN_EXCEPTIONS__',
     '-I' + utils.path_from_root('system/lib/wasmfs/'),
     '-std=c++17',
   ]

diff --git a/tools/system_libs.py b/tools/system_libs.py
@@ -1570,7 +1570,7 @@ def get_cflags(self):
     if self.eh_mode == Exceptions.NONE:
       cflags.append('-D_LIBCXXABI_NO_EXCEPTIONS')
     elif self.eh_mode == Exceptions.EMSCRIPTEN:
-      cflags.append('-D__USING_EMSCRIPTEN_EXCEPTIONS__')
+      cflags.append('-D__EMSCRIPTEN_EXCEPTIONS__')
       # The code used to interpret exceptions during terminate
       # is not compatible with emscripten exceptions.
       cflags.append('-DLIBCXXABI_SILENT_TERMINATE')
@@ -1684,7 +1684,7 @@ def get_cflags(self):
     if self.eh_mode == Exceptions.NONE:
       cflags.append('-D_LIBUNWIND_HAS_NO_EXCEPTIONS')
     elif self.eh_mode == Exceptions.EMSCRIPTEN:
-      cflags.append('-D__USING_EMSCRIPTEN_EXCEPTIONS__')
+      cflags.append('-D__EMSCRIPTEN_EXCEPTIONS__')
     elif self.eh_mode == Exceptions.WASM:
       cflags.append('-D__WASM_EXCEPTIONS__')
     return cflags