- Cleanup old IMPORT stuff

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 8d7f6c05d4896a350b23c2b46983a72e6f826856..6e14f4619e6b8ce97bb2a55afaf0dda5e846a132 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -549,8 +549,9 @@ int zendlex(znode *zendlval CLS_DC);
 
 #define ZEND_EVAL                              (1<<0)
 #define ZEND_INCLUDE                   (1<<1)
-#define ZEND_IMPORT                            (1<<2)
+#define ZEND_INCLUDE_ONCE              (1<<2)
 #define ZEND_REQUIRE                   (1<<3)
+#define ZEND_REQUIRE_ONCE              (1<<4)
 
 #define ZEND_ISSET                             (1<<0)
 #define ZEND_ISEMPTY                   (1<<1)

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index b66d21331f8849d345b46a399e964e0b32819ffc..8eb55c6de47806cb17300425e589672368d4de93 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2056,7 +2056,6 @@ send_by_ref:
 
                                        switch (opline->op2.u.constant.value.lval) {
                                                case ZEND_INCLUDE:
-                                               case ZEND_IMPORT:
                                                case ZEND_REQUIRE:
                                                        new_op_array = compile_filename(opline->op2.u.constant.value.lval, get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_R) CLS_CC ELS_CC);
                                                        break;