MULT

locale.c

@@ -409,7 +409,7 @@ static int debug_initialization = 0;
 /* Automatically include the caller's file, and line number in debugging output;
  * and the errno (and/or extended errno) if non-zero.  On threaded perls add
  * the aTHX too. */
-#  if defined(USE_THREADS) && ! defined(NO_LOCALE_THREADS)
+#  if defined(MULTIPLICITY) && ! defined(NO_LOCALE_THREADS)
 #    define DEBUG_PRE_STMTS                                                 \
         DEBUG_ERRNO;                                                        \
         PerlIO_printf(Perl_debug_log, "\n%s: %" LINE_Tf ": 0x%p%s: ",       \
@@ -5233,7 +5233,7 @@ S_my_setlocale_debug_string_i(pTHX_
         retval_quote = "\"";
     }
 
-#  ifdef USE_LOCALE_THREADS
+#  ifdef MULTIPLICITY
 #    define THREAD_FORMAT "%p:"
 #    define THREAD_ARGUMENT aTHX_
 #  else
@@ -5828,7 +5828,7 @@ Perl_mbtowc_(pTHX_ const wchar_t * pwc, const char * s, const Size_t len)
 
 #else   /* Below we have some form of mbtowc() */
 #  if defined(HAS_MBRTOWC)                                      \
-   && (defined(USE_LOCALE_THREADS) || ! defined(HAS_MBTOWC))
+   && (defined(MULTIPLICITY) || ! defined(HAS_MBTOWC))
 #    define USE_MBRTOWC
 #  else
 #    undef USE_MBRTOWC
@@ -11644,7 +11644,7 @@ Perl_thread_locale_term(pTHX)
      * they affect libc's knowledge of the thread; libc has no knowledge of
      * aTHX */
 
-#if defined(USE_POSIX_2008_LOCALE) && defined(USE_THREADS)
+#if defined(USE_POSIX_2008_LOCALE) && defined(MULTIPLICITY)
 
     /* Switch to the global locale, so can free up the per-thread object */
     locale_t actual_obj = uselocale(LC_GLOBAL_LOCALE);