Re-order CV flags to bring the 4 CVf_BUILTIN_ATTRS into adjacent bits,

[p5sagit/p5-mst-13.2.git] / ext / Devel / DProf / DProf.xs

diff --git a/ext/Devel/DProf/DProf.xs b/ext/Devel/DProf/DProf.xs
index 39a604d..02396e9 100644 (file)
--- a/ext/Devel/DProf/DProf.xs
+++ b/ext/Devel/DProf/DProf.xs
@@ -136,9 +136,7 @@ typedef struct {
     long long  start_cnt;
 #endif
 #ifdef PERL_IMPLICIT_CONTEXT
-#  define register
-    pTHX;
-#  undef register
+    PerlInterpreter *my_perl;
 #endif
 } prof_state_t;
 
@@ -170,7 +168,7 @@ prof_state_t g_prof_state;
 #define g_default_perldb       g_prof_state.default_perldb
 #define g_depth                        g_prof_state.depth
 #ifdef PERL_IMPLICIT_CONTEXT
-#  define g_THX                        g_prof_state.aTHX
+#  define g_THX                        g_prof_state.my_perl
 #endif
 #ifdef OS2
 #  define g_frequ              g_prof_state.frequ
@@ -183,7 +181,6 @@ dprof_times(pTHX_ struct tms *t)
 #ifdef OS2
     ULONG rc;
     QWORD cnt;
-    STRLEN n_a;
     
     if (!g_frequ) {
        if (CheckOSError(DosTmrQueryFreq(&g_frequ)))
@@ -192,7 +189,7 @@ dprof_times(pTHX_ struct tms *t)
            g_frequ = g_frequ/DPROF_HZ; /* count per tick */
        if (CheckOSError(DosTmrQueryTime(&cnt)))
            croak("DosTmrQueryTime: %s",
-                 SvPV(perl_get_sv("!",TRUE), n_a));
+                 SvPV_nolen_const(perl_get_sv("!",TRUE)));
        g_start_cnt = toLongLong(cnt);
     }
 
@@ -738,7 +735,7 @@ BOOT:
        g_key_hash = newSV(256);
         g_prof_pid = (int)getpid();
 
-       New(0, g_profstack, g_profstack_max, PROFANY);
+       Newx(g_profstack, g_profstack_max, PROFANY);
         prof_recordheader(aTHX);
         DBG_TIMER_NOTIFY("Profiler timer is on.\n");
        g_orealtime = g_rprof_start = Times(&g_prof_start);