back out previous change (it breaks PERL_OBJECT)

p4raw-id: //depot/perl@1136

1 files changed, 7 insertions, 7 deletions

diff --git a/pp_ctl.c b/pp_ctl.c
index ac2ddfc49d..9b924bc0f8 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -2015,7 +2015,7 @@ PP(pp_goto)
 
     if (top_env->je_prev) {
         restartop = retop;
-        JMPENV_JUMP(JMP_EXCEPTION);
+        JMPENV_JUMP(3);
     }
 
     RETURNOP(retop);
@@ -2110,7 +2110,7 @@ STATIC OP *
 docatch(OP *o)
 {
     dTHR;
-    int jmpstat;
+    int ret;
     OP *oldop = op;
     dJMPENV;
 
@@ -2119,14 +2119,14 @@ docatch(OP *o)
     assert(CATCH_GET == TRUE);
     DEBUG_l(deb("Setting up local jumplevel %p, was %p\n", &cur_env, top_env));
 #endif
-    JMPENV_PUSH(jmpstat);
-    switch (jmpstat) {
+    JMPENV_PUSH(ret);
+    switch (ret) {
     default:				/* topmost level handles it */
 	JMPENV_POP;
 	op = oldop;
-	JMPENV_JUMP(jmpstat);
+	JMPENV_JUMP(ret);
 	/* NOTREACHED */
-    case JMP_EXCEPTION:
+    case 3:
 	if (!restartop) {
 	    PerlIO_printf(PerlIO_stderr(), "panic: restartop\n");
 	    break;
@@ -2134,7 +2134,7 @@ docatch(OP *o)
 	op = restartop;
 	restartop = 0;
 	/* FALL THROUGH */
-    case JMP_NORMAL:
+    case 0:
         CALLRUNOPS();
 	break;
     }