Remove #ifdef DEPRECATED stuff: newXSUB, pp_entersubr, FREE_TMPS().

p4raw-id: //depot/perl@206

diff --git a/op.c b/op.c
index 243b3c7..e91bea9 100644 (file)
--- a/op.c
+++ b/op.c
@@ -3615,22 +3615,7 @@ OP *block;
     return cv;
 }
 
-#ifdef DEPRECATED
-CV *
-newXSUB(name, ix, subaddr, filename)
-char *name;
-I32 ix;
-I32 (*subaddr)();
-char *filename;
-{
-    CV* cv = newXS(name, (void(*)())subaddr, filename);
-    CvOLDSTYLE_on(cv);
-    CvXSUBANY(cv).any_i32 = ix;
-    return cv;
-}
-#endif
-
-CV *
+V *
 newXS(name, subaddr, filename)
 char *name;
 void (*subaddr) _((CV*));

diff --git a/pp_ctl.c b/pp_ctl.c
index d4d2e2f..915ee6c 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -1117,21 +1117,6 @@ PP(pp_orassign)
        RETURNOP(cLOGOP->op_other);
 }
        
-#ifdef DEPRECATED
-PP(pp_entersubr)
-{
-    dSP;
-    SV** mark = (stack_base + *markstack_ptr + 1);
-    SV* cv = *mark;
-    while (mark < sp) {        /* emulate old interface */
-       *mark = mark[1];
-       mark++;
-    }
-    *sp = cv;
-    return pp_entersub(ARGS);
-}
-#endif
-
 PP(pp_caller)
 {
     dSP;

diff --git a/proto.h b/proto.h
index 963cd17..2bfc9be 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -305,9 +305,6 @@ OP* newSLICEOP _((I32 flags, OP* subscript, OP* list));
 OP*    newSTATEOP _((I32 flags, char* label, OP* o));
 CV*    newSUB _((I32 floor, OP* o, OP* proto, OP* block));
 CV*    newXS _((char* name, void (*subaddr)(CV* cv), char* filename));
-#ifdef DEPRECATED
-CV*    newXSUB _((char* name, I32 ix, I32 (*subaddr)(int,int,int), char* filename));
-#endif
 AV*    newAV _((void));
 OP*    newAVREF _((OP* o));
 OP*    newBINOP _((I32 type, I32 flags, OP* first, OP* last));

diff --git a/scope.h b/scope.h
index d9fe15a..a65cb62 100644 (file)
--- a/scope.h
+++ b/scope.h
@@ -38,9 +38,6 @@
 
 #define SAVETMPS save_int((int*)&tmps_floor), tmps_floor = tmps_ix
 #define FREETMPS if (tmps_ix > tmps_floor) free_tmps()
-#ifdef DEPRECATED
-#define FREE_TMPS() FREETMPS
-#endif
 
 #define ENTER push_scope()
 #define LEAVE pop_scope()