[perl #120670] make perl headers C++11 compatible

diff --git a/inline.h b/inline.h
index 226970b..518d8da 100644 (file)
--- a/inline.h
+++ b/inline.h
@@ -244,7 +244,7 @@ S_bootstrap_ctype(U8 character, UV classnum, bool full_Latin1)
 
         default: break;
     }
-    Perl_croak(aTHX_ "panic: bootstrap_ctype() has an unexpected character class '%"UVxf"'", classnum);
+    Perl_croak(aTHX_ "panic: bootstrap_ctype() has an unexpected character class '%" UVxf "'", classnum);
 }
 #endif
 

diff --git a/pad.h b/pad.h
index 81d3c81..6269bdc 100644 (file)
--- a/pad.h
+++ b/pad.h
@@ -143,14 +143,14 @@ typedef enum {
 #  define ASSERT_CURPAD_LEGAL(label) \
     pad_peg(label); \
     if (PL_comppad ? (AvARRAY(PL_comppad) != PL_curpad) : (PL_curpad != 0))  \
-       Perl_croak(aTHX_ "panic: illegal pad in %s: 0x%"UVxf"[0x%"UVxf"]",\
+       Perl_croak(aTHX_ "panic: illegal pad in %s: 0x%" UVxf "[0x%" UVxf "]",\
            label, PTR2UV(PL_comppad), PTR2UV(PL_curpad));
 
 
 #  define ASSERT_CURPAD_ACTIVE(label) \
     pad_peg(label); \
     if (!PL_comppad || (AvARRAY(PL_comppad) != PL_curpad))               \
-       Perl_croak(aTHX_ "panic: invalid pad in %s: 0x%"UVxf"[0x%"UVxf"]",\
+       Perl_croak(aTHX_ "panic: invalid pad in %s: 0x%" UVxf "[0x%" UVxf "]",\
            label, PTR2UV(PL_comppad), PTR2UV(PL_curpad));
 #else
 #  define ASSERT_CURPAD_LEGAL(label)
@@ -325,7 +325,7 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL()
        PL_comppad = (PAD*) (PadlistARRAY(padlist)[nth]);       \
        PL_curpad = AvARRAY(PL_comppad);                        \
        DEBUG_Xv(PerlIO_printf(Perl_debug_log,                  \
-             "Pad 0x%"UVxf"[0x%"UVxf"] set_cur    depth=%d\n", \
+             "Pad 0x%" UVxf "[0x%" UVxf "] set_cur    depth=%d\n",     \
              PTR2UV(PL_comppad), PTR2UV(PL_curpad), (int)(nth)));
 
 
@@ -343,7 +343,7 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL()
        PL_comppad = (npad);                                    \
        PL_curpad =  PL_comppad ? AvARRAY(PL_comppad) : NULL;   \
        DEBUG_Xv(PerlIO_printf(Perl_debug_log,                  \
-             "Pad 0x%"UVxf"[0x%"UVxf"] save_local\n",          \
+             "Pad 0x%" UVxf "[0x%" UVxf "] save_local\n",              \
              PTR2UV(PL_comppad), PTR2UV(PL_curpad)));
 
 #define PAD_RESTORE_LOCAL(opad) \
@@ -351,7 +351,7 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL()
        PL_comppad = opad;                                              \
        PL_curpad =  PL_comppad ? AvARRAY(PL_comppad) : NULL;   \
        DEBUG_Xv(PerlIO_printf(Perl_debug_log,                  \
-             "Pad 0x%"UVxf"[0x%"UVxf"] restore_local\n",       \
+             "Pad 0x%" UVxf "[0x%" UVxf "] restore_local\n",   \
              PTR2UV(PL_comppad), PTR2UV(PL_curpad)));
 
 

diff --git a/perl.h b/perl.h
index b6e0c3e..d00c64b 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -3029,7 +3029,7 @@ typedef pthread_key_t     perl_key;
 
 /* Takes three arguments: is_utf8, length, str */
 #ifndef UTF8f
-#  define UTF8f "d%"UVuf"%4p"
+#  define UTF8f "d%" UVuf "%4p"
 #endif
 #define UTF8fARG(u,l,p) (int)cBOOL(u), (UV)(l), (void*)(p)
 
@@ -4118,7 +4118,7 @@ START_EXTERN_C
 EXTCONST char PL_warn_uninit[]
   INIT("Use of uninitialized value%s%s%s");
 EXTCONST char PL_warn_uninit_sv[]
-  INIT("Use of uninitialized value%"SVf"%s%s");
+  INIT("Use of uninitialized value%" SVf "%s%s");
 EXTCONST char PL_warn_nosemi[]
   INIT("Semicolon seems to be missing");
 EXTCONST char PL_warn_reserved[]
@@ -4138,7 +4138,7 @@ EXTCONST char PL_no_usym[]
 EXTCONST char PL_no_aelem[]
   INIT("Modification of non-creatable array value attempted, subscript %d");
 EXTCONST char PL_no_helem_sv[]
-  INIT("Modification of non-creatable hash value attempted, subscript \"%"SVf"\"");
+  INIT("Modification of non-creatable hash value attempted, subscript \"%" SVf "\"");
 EXTCONST char PL_no_modify[]
   INIT("Modification of a read-only value attempted");
 EXTCONST char PL_no_mem[sizeof("Out of memory!\n")]