POSIX.xs: Use new names for lock macros

Author: khwilliamson

ext/POSIX/POSIX.xs

@@ -1768,9 +1768,9 @@ my_tzset(pTHX)
 #endif
         fix_win32_tzenv();
 #endif
-    TZSET_LOCK;
+    PERL_TZSET_LOCK;
     tzset();
-    TZSET_UNLOCK;
+    PERL_TZSET_UNLOCK;
     /* After the unlock, another thread could change things, but this is a
      * problem with the Posix API generally, not Perl; and the result will be
      * self-consistent */
@@ -3205,9 +3205,9 @@ mblen(s, n = ~0)
             memzero(&PL_mbrlen_ps, sizeof(PL_mbrlen_ps));
             RETVAL = 0;
 #else
-            MBLEN_LOCK_;
+            PERL_MBLEN_LOCK;
             RETVAL = mblen(NULL, 0);
-            MBLEN_UNLOCK_;
+            PERL_MBLEN_UNLOCK;
 #endif
         }
         else {  /* Not resetting state */
@@ -3221,17 +3221,17 @@ mblen(s, n = ~0)
                 char * string = SvPVbyte(byte_s, len);
                 if (n < len) len = n;
 #ifdef USE_MBRLEN
-                MBRLEN_LOCK_;
+                PERL_MBRLEN_LOCK;
                 RETVAL = (SSize_t) mbrlen(string, len, &PL_mbrlen_ps);
-                MBRLEN_UNLOCK_;
+                PERL_MBRLEN_UNLOCK;
                 if (RETVAL < 0) RETVAL = -1;    /* Use mblen() ret code for
                                                    transparency */
 #else
                 /* Locking prevents races, but locales can be switched out
                  * without locking, so this isn't a cure all */
-                MBLEN_LOCK_;
+                PERL_MBLEN_LOCK;
                 RETVAL = mblen(string, len);
-                MBLEN_UNLOCK_;
+                PERL_MBLEN_UNLOCK;
 #endif
             }
         }
@@ -3297,27 +3297,27 @@ wctomb(s, wchar)
 #ifdef USE_WCRTOMB
             /* The man pages khw looked at are in agreement that this works.
              * But probably memzero would too */
-            WCRTOMB_LOCK_;
+            PERL_WCRTOMB_LOCK;
             RETVAL = wcrtomb(NULL, L'\0', &PL_wcrtomb_ps);
-            WCRTOMB_UNLOCK_;
+            PERL_WCRTOMB_UNLOCK;
 #else
-            WCTOMB_LOCK_;
+            PERL_WCTOMB_LOCK;
             RETVAL = wctomb(NULL, L'\0');
-            WCTOMB_UNLOCK_;
+            PERL_WCTOMB_UNLOCK;
 #endif
         }
         else {  /* Not resetting state */
             char buffer[MB_LEN_MAX];
 #ifdef USE_WCRTOMB
-            WCRTOMB_LOCK_;
+            PERL_WCRTOMB_LOCK;
             RETVAL = wcrtomb(buffer, wchar, &PL_wcrtomb_ps);
-            WCRTOMB_UNLOCK_;
+            PERL_WCRTOMB_UNLOCK;
 #else
             /* Locking prevents races, but locales can be switched out without
              * locking, so this isn't a cure all */
-            WCTOMB_LOCK_;
+            PERL_WCTOMB_LOCK;
             RETVAL = wctomb(buffer, wchar);
-            WCTOMB_UNLOCK_;
+            PERL_WCTOMB_UNLOCK;
 #endif
             if (RETVAL >= 0) {
                 sv_setpvn_mg(s, buffer, RETVAL);
@@ -3332,9 +3332,9 @@ strcoll(s1, s2)
 	char *		s2
     CODE:
         CHECK_AND_WARN_PROBLEMATIC_LOCALE_;
-	LC_COLLATE_LOCK;
+        PERL_STRCOLL_LOCK;
         RETVAL = strcoll(s1, s2);
-        LC_COLLATE_UNLOCK;
+        PERL_STRCOLL_UNLOCK;
     OUTPUT:
         RETVAL
 
@@ -3546,9 +3546,9 @@ asctime(sec, min, hour, mday, mon, year, wday = 0, yday = 0, isdst = -1)
 	    mytm.tm_isdst = isdst;
 	    if (ix) {
 	        time_t result;
-                MKTIME_LOCK;
+                PERL_MKTIME_LOCK;
 	        result = mktime(&mytm);
-                MKTIME_UNLOCK;
+                PERL_MKTIME_UNLOCK;
 		if (result == (time_t)-1)
 		    SvOK_off(TARG);
 		else if (result == 0)
@@ -3558,9 +3558,9 @@ asctime(sec, min, hour, mday, mon, year, wday = 0, yday = 0, isdst = -1)
 		else
 		    sv_setiv(TARG, (IV)result);
 	    } else {
-                ASCTIME_LOCK;
+                PERL_ASCTIME_LOCK;
 		sv_setpv(TARG, asctime(&mytm));
-                ASCTIME_UNLOCK;
+                PERL_ASCTIME_UNLOCK;
 	    }
 	    ST(0) = TARG;
 	    XSRETURN(1);
@@ -3642,10 +3642,10 @@ tzname()
 	EXTEND(SP,2);
         /* It is undefined behavior if another thread is changing this while
          * its being read */
-        ENVr_LOCALEr_LOCK;
+        PERL_TZSET_LOCK;
 	PUSHs(newSVpvn_flags(tzname[0], strlen(tzname[0]), SVs_TEMP));
 	PUSHs(newSVpvn_flags(tzname[1], strlen(tzname[1]), SVs_TEMP));
-        ENVr_LOCALEr_UNLOCK;
+        PERL_TZSET_UNLOCK;
 
 char *
 ctermid(s = 0)