fixups

Author: khwilliamson

locale.c

@@ -2198,8 +2198,8 @@ S_querylocale_2008_i(pTHX_ const locale_category_index index,
 #      define QUERYLOCALE_LOCK
 #      define QUERYLOCALE_UNLOCK
 #    else
-#      define QUERYLOCALE_LOCK    GENxLCr_LOCK
-#      define QUERYLOCALE_UNLOCK  GENxLCr_UNLOCK
+#      define QUERYLOCALE_LOCK    PERL_GENx_LCr_LOCK(0)
+#      define QUERYLOCALE_UNLOCK  PERL_GENx_LCr_UNLOCK(0)
 #    endif
 
     /* Finally, everything is ready, so here is the 'else' clause to implement
@@ -5163,9 +5163,9 @@ Perl_mbtowc_(pTHX_ const wchar_t * pwc, const char * s, const Size_t len)
 #  else
 
         SETERRNO(0, 0);
-        MBTOWC_LOCK;
+        PERL_MBTOWC_LOCK;
         retval = mbtowc(NULL, NULL, 0);
-        MBTOWC_UNLOCK;
+        PERL_MBTOWC_UNLOCK;
         return retval;
 
 #  endif
@@ -5916,10 +5916,10 @@ S_populate_hash_from_localeconv(pTHX_ HV * hv,
 #    define LOCALECONV_UNLOCK
 #  else
 
-    GENxLCr_LOCK;
+    PERL_GENx_LCr_LOCK(0);
 
 #    undef LOCALECONV_UNLOCK
-#    define LOCALECONV_UNLOCK  GENxLCr_UNLOCK
+#    define LOCALECONV_UNLOCK  PERL_GENx_LCr_UNLOCK(0)
 #  endif
 #  if ! defined(TS_W32_BROKEN_LOCALECONV) || ! defined(USE_THREAD_SAFE_LOCALE)
 #    define WIN32_TEARDOWN
@@ -6541,9 +6541,9 @@ S_langinfo_sv_i(pTHX_
        {
         /* An ugly API; only the first byte of the returned char* address means
          * anything */
-        NL_LANGINFO_LOCK;
+        PERL_NL_LANGINFO_LOCK;
         char char_value = nl_langinfo(item)[0];
-        NL_LANGINFO_UNLOCK;
+        PERL_NL_LANGINFO_UNLOCK;
 
         sv_setuv(sv, char_value);
        }
@@ -6574,9 +6574,9 @@ S_langinfo_sv_i(pTHX_
 
        {    /* A slightly less ugly API; the int portion of the returned char*
              * address is an integer. */
-        NL_LANGINFO_LOCK;
+        PERL_NL_LANGINFO_LOCK;
         int int_value = (int) PTR2UV(nl_langinfo(item));
-        NL_LANGINFO_UNLOCK;
+        PERL_NL_LANGINFO_UNLOCK;
 
         sv_setuv(sv, int_value);
        }
@@ -6605,7 +6605,7 @@ S_langinfo_sv_i(pTHX_
 
         /* The rest of the possibilities deliver a true char* pointer to a
          * string (or sequence of strings in the case of ALT_DIGITS) */
-        NL_LANGINFO_LOCK;
+        PERL_NL_LANGINFO_LOCK;
 
         retval = nl_langinfo(item);
         Size_t total_len = strlen(retval);
@@ -6633,7 +6633,7 @@ S_langinfo_sv_i(pTHX_
              * workaround for finding if the codeset is UTF-8.  In many cases,
              * the function works properly; but otherwise you are at the mercy
              * of this bug */
-            case CODESET:
+            case CODESET: ;
 #  endif
                 const char * msg = form(
                                         "nl_langinfo returned empty for %ld"
@@ -6651,7 +6651,7 @@ S_langinfo_sv_i(pTHX_
                                         strtod("1,5", NULL),
                                         strtod("1.5", NULL)
                                       );
-                NL_LANGINFO_UNLOCK;
+                PERL_NL_LANGINFO_UNLOCK;
                 locale_panic_(msg);
         }
 
@@ -6719,7 +6719,7 @@ S_langinfo_sv_i(pTHX_
                                         byte_dump_string_((U8 *) retval,
                                                           total_len, 0),
                                         locale);
-                NL_LANGINFO_UNLOCK;
+                PERL_NL_LANGINFO_UNLOCK;
                 locale_panic_(msg);
             }
             else {
@@ -6748,7 +6748,7 @@ S_langinfo_sv_i(pTHX_
 
         sv_setpvn(sv, retval, total_len);
 
-        NL_LANGINFO_UNLOCK;
+        PERL_NL_LANGINFO_UNLOCK;
 
         /* Convert the ALT_DIGITS separator to a semi-colon if not already */
         if (UNLIKELY(item == ALT_DIGITS) && total_len > 0 && separator != ';') {
@@ -8509,7 +8509,7 @@ S_ints_to_tm(pTHX_ struct tm * mytm,
         /* Unlike mini_mktime(), it does consider the locale, so have to switch
          * to the correct one. */
         const char * orig_TIME_locale = toggle_locale_c(LC_TIME, locale);
-        MKTIME_LOCK;
+        PERL_MKTIME_LOCK;
 
         /* 'which_tm' points to an auxiliary copy if we ran mini_mktime().
          * Otherwise it points to the passed-in one which now gets populated
@@ -8619,16 +8619,16 @@ S_strftime_tm(pTHX_ const char *fmt,
         }
 
         RESTORE_ERRNO;
-        STRFTIME_UNLOCK;
+        PERL_STRFTIME_UNLOCK;
 
         if (strftime_failed) {
             goto strftime_failed;
         }
 
 #else
-        STRFTIME_LOCK;
+        PERL_STRFTIME_LOCK;
         Size_t len = strftime(buf, bufsize, fmt, mytm);
-        STRFTIME_UNLOCK;
+        PERL_STRFTIME_UNLOCK;
 #endif
 
         GCC_DIAG_RESTORE_STMT;
@@ -9092,7 +9092,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
 #  endif
 #  if ! defined(PERL_LC_ALL_USES_NAME_VALUE_PAIRS) && defined(LC_ALL)
 
-    GENxLCr_LOCK;
+    PERL_GENx_LCr_LOCK(0);
 
     /* If we haven't done so already, translate the LC_ALL positions of
      * categories into our internal indices. */
@@ -9128,25 +9128,25 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
 
     }
 
-    GENxLCr_UNLOCK;
+    PERL_GENx_LCr_UNLOCK(0);
 
 #  endif
 #  ifdef USE_POSIX_2008_LOCALE
 
     /* This is a global, so be sure to keep another instance from zapping it */
-    GENxLCr_LOCK;
+    PERL_GENx_LCr_LOCK(0);
     if (PL_C_locale_obj) {
-        GENxLCr_UNLOCK;
+        PERL_GENx_LCr_UNLOCK(0);
     }
     else {
         PERL_NEWLOCALE_LOCK;
         PL_C_locale_obj = newlocale(LC_ALL_MASK, "C", (locale_t) 0);
         PERL_NEWLOCALE_UNLOCK;
         if (! PL_C_locale_obj) {
-            GENxLCr_UNLOCK;
+            PERL_GENx_LCr_UNLOCK(0);
             locale_panic_("Cannot create POSIX 2008 C locale object");
         }
-        GENxLCr_UNLOCK;
+        PERL_GENx_LCr_UNLOCK(0);
 
         DEBUG_Lv(PerlIO_printf(Perl_debug_log, "created C object %p\n",
                                                PL_C_locale_obj));
@@ -10565,12 +10565,12 @@ Perl_strxfrm(pTHX_ SV * src)
  * qualifies), these yield the correct one */
 #if defined(USE_LOCALE_CTYPE)
 #  define WHICH_LC_INDEX LC_CTYPE_INDEX_
-#  define WHICH_LOCK     LCr_LOCK_(LC_CTYPE)
-#  define WHICH_UNLOCK   LCr_UNLOCK_(LC_CTYPE)
+#  define WHICH_LOCK     PERL_LCr_LOCK_(LC_CTYPE)
+#  define WHICH_UNLOCK   PERL_LCr_UNLOCK_(LC_CTYPE)
 #elif defined(USE_LOCALE_MESSAGES)
 #  define WHICH_LC_INDEX LC_MESSAGES_INDEX_
-#  define WHICH_LOCK     LCr_LOCK_(LC_MESSAGES)
-#  define WHICH_UNLOCK   LCr_UNLOCK_(LC_MESSAGES)
+#  define WHICH_LOCK     PERL_LCr_LOCK_(LC_MESSAGES)
+#  define WHICH_UNLOCK   PERL_LCr_UNLOCK_(LC_MESSAGES)
 #endif
 
 /*===========================================================================*/