11792 wasn't complete

[p5sagit/p5-mst-13.2.git] / embedvar.h

diff --git a/embedvar.h b/embedvar.h
index b5c6340..9198d2e 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -6,13 +6,13 @@
 /* (Doing namespace management portably in C is really gross.) */
 
 /*
-   The following combinations of MULTIPLICITY, USE_THREADS, PERL_OBJECT
+   The following combinations of MULTIPLICITY, USE_5005THREADS, PERL_OBJECT
    and PERL_IMPLICIT_CONTEXT are supported:
      1) none
      2) MULTIPLICITY   # supported for compatibility
      3) MULTIPLICITY && PERL_IMPLICIT_CONTEXT
-     4) USE_THREADS && PERL_IMPLICIT_CONTEXT
-     5) MULTIPLICITY && USE_THREADS && PERL_IMPLICIT_CONTEXT
+     4) USE_5005THREADS && PERL_IMPLICIT_CONTEXT
+     5) MULTIPLICITY && USE_5005THREADS && PERL_IMPLICIT_CONTEXT
      6) PERL_OBJECT && PERL_IMPLICIT_CONTEXT
 
    All other combinations of these flags are errors.
@@ -170,7 +170,7 @@
 #    include "error: PERL_OBJECT + MULTIPLICITY don't go together"
 #  endif
 
-#  if defined(USE_THREADS)
+#  if defined(USE_5005THREADS)
 /* case 5 above */
 
 #define PL_Argv                        (PERL_GET_INTERP->IArgv)
@@ -223,6 +223,8 @@
 #define PL_curcopdb            (PERL_GET_INTERP->Icurcopdb)
 #define PL_curstname           (PERL_GET_INTERP->Icurstname)
 #define PL_curthr              (PERL_GET_INTERP->Icurthr)
+#define PL_custom_op_descs     (PERL_GET_INTERP->Icustom_op_descs)
+#define PL_custom_op_names     (PERL_GET_INTERP->Icustom_op_names)
 #define PL_dbargs              (PERL_GET_INTERP->Idbargs)
 #define PL_debstash            (PERL_GET_INTERP->Idebstash)
 #define PL_debug               (PERL_GET_INTERP->Idebug)
@@ -456,7 +458,7 @@
 #define PL_yynerrs             (PERL_GET_INTERP->Iyynerrs)
 #define PL_yyval               (PERL_GET_INTERP->Iyyval)
 
-#  else                /* !USE_THREADS */
+#  else                /* !USE_5005THREADS */
 /* cases 2 and 3 above */
 
 #define PL_Argv                        (vTHX->IArgv)
@@ -509,6 +511,8 @@
 #define PL_curcopdb            (vTHX->Icurcopdb)
 #define PL_curstname           (vTHX->Icurstname)
 #define PL_curthr              (vTHX->Icurthr)
+#define PL_custom_op_descs     (vTHX->Icustom_op_descs)
+#define PL_custom_op_names     (vTHX->Icustom_op_names)
 #define PL_dbargs              (vTHX->Idbargs)
 #define PL_debstash            (vTHX->Idebstash)
 #define PL_debug               (vTHX->Idebug)
@@ -742,7 +746,7 @@
 #define PL_yynerrs             (vTHX->Iyynerrs)
 #define PL_yyval               (vTHX->Iyyval)
 
-#  endif       /* USE_THREADS */
+#  endif       /* USE_5005THREADS */
 
 #else  /* !MULTIPLICITY */
 
@@ -934,6 +938,8 @@
 #define PL_curcopdb            (aTHXo->interp.Icurcopdb)
 #define PL_curstname           (aTHXo->interp.Icurstname)
 #define PL_curthr              (aTHXo->interp.Icurthr)
+#define PL_custom_op_descs     (aTHXo->interp.Icustom_op_descs)
+#define PL_custom_op_names     (aTHXo->interp.Icustom_op_names)
 #define PL_dbargs              (aTHXo->interp.Idbargs)
 #define PL_debstash            (aTHXo->interp.Idebstash)
 #define PL_debug               (aTHXo->interp.Idebug)
@@ -1221,6 +1227,8 @@
 #define PL_Icurcopdb           PL_curcopdb
 #define PL_Icurstname          PL_curstname
 #define PL_Icurthr             PL_curthr
+#define PL_Icustom_op_descs    PL_custom_op_descs
+#define PL_Icustom_op_names    PL_custom_op_names
 #define PL_Idbargs             PL_dbargs
 #define PL_Idebstash           PL_debstash
 #define PL_Idebug              PL_debug
@@ -1454,7 +1462,7 @@
 #define PL_Iyynerrs            PL_yynerrs
 #define PL_Iyyval              PL_yyval
 
-#    if defined(USE_THREADS)
+#    if defined(USE_5005THREADS)
 /* case 4 above */
 
 #define PL_Sv                  (aTHX->TSv)
@@ -1593,7 +1601,7 @@
 #define PL_watchaddr           (aTHX->Twatchaddr)
 #define PL_watchok             (aTHX->Twatchok)
 
-#    else      /* !USE_THREADS */
+#    else      /* !USE_5005THREADS */
 /* case 1 above */
 
 #define PL_TSv                 PL_Sv
@@ -1732,7 +1740,7 @@
 #define PL_Twatchaddr          PL_watchaddr
 #define PL_Twatchok            PL_watchok
 
-#    endif     /* USE_THREADS */
+#    endif     /* USE_5005THREADS */
 #  endif       /* PERL_OBJECT */
 #endif /* MULTIPLICITY */