Simplify some LC_NUMERIC macros

These macros are marked as subject to change and are not documented
externally.  I don't know what I was thinking when I named some of them,
but whatever no longer makes sense to me.  Simplify them, and change so
there is only one restore macro to remember.

1 files changed, 3 insertions, 2 deletions

diff --git a/vutil.c b/vutil.c
index 34c0b55d57..5d838331b2 100644
--- a/vutil.c
+++ b/vutil.c
@@ -652,7 +652,8 @@ VER_NV:
 	}
 #endif
         { /* Braces needed because macro just below declares a variable */
-        STORE_NUMERIC_LOCAL_SET_STANDARD();
+        DECLARATION_FOR_LC_NUMERIC_MANIPULATION;
+        STORE_LC_NUMERIC_SET_STANDARD();
         LOCK_NUMERIC_STANDARD();
 	if (sv) {
 	    Perl_sv_catpvf(aTHX_ sv, "%.9"NVff, SvNVX(ver));
@@ -664,7 +665,7 @@ VER_NV:
 	    buf = tbuf;
 	}
         UNLOCK_NUMERIC_STANDARD();
-        RESTORE_NUMERIC_LOCAL();
+        RESTORE_LC_NUMERIC();
         }
 	while (buf[len-1] == '0' && len > 0) len--;
 	if ( buf[len-1] == '.' ) len--; /* eat the trailing decimal */