Merge pull request #5207 from BOINC/MacOS_13_3_1_fix

Work around uselocale() apparently broken in MacOS 13.3.1
BOINC · Apr 27, 2023 · ce1eab0 · ce1eab0
2 parents 2d7e82b + a83e678
commit ce1eab0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h
@@ -788,7 +788,9 @@ struct RPC {
 };
 
 
-#if defined(HAVE__CONFIGTHREADLOCALE) || defined(HAVE_USELOCALE)
+// MacOS 13.3.1 apparently broke per-thread locale uselocale() so we must
+// use our SET_LOCALE struct on MacOS even though HAVE_USELOCALE is defined.
+#if (defined(HAVE__CONFIGTHREADLOCALE) || defined(HAVE_USELOCALE)) && !defined(__APPLE__)
 // no-op, the calling thread is already set to use C locale
 struct SET_LOCALE {
     SET_LOCALE() {}