Remove some dead defines

diff --git a/Zend/zend.h b/Zend/zend.h
index ca85619d4cfd1946cfa9bb101f808e1862e3fcac..e886ba20d374c28b26c4498e6f62cef474736270 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -89,11 +89,6 @@ ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_noreturn(int type, const char *
 # define zend_error_noreturn zend_error
 #endif
 
-/* overloaded elements data types */
-#define OE_IS_ARRAY                                    (1<<0)
-#define OE_IS_OBJECT                           (1<<1)
-#define OE_IS_METHOD                           (1<<2)
-
 struct _zend_serialize_data;
 struct _zend_unserialize_data;
 

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index ef99cd1e3ebde6ca9360ca44d859eb769e7753c5..f3dc8081b8a7b63d930962697a82ddfc3282109e 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -31,8 +31,6 @@
 
 #include "zend_llist.h"
 
-#define DEBUG_ZEND 0
-
 #define SET_UNUSED(op)  op ## _type = IS_UNUSED
 
 #define MAKE_NOP(opline) do { \

diff --git a/Zend/zend_globals_macros.h b/Zend/zend_globals_macros.h
index d2baef3555d156e9d44cdbb79194e8f02ac66634..c0a9efbfbff4fab2417253cf0e47387809e48953 100644 (file)
--- a/Zend/zend_globals_macros.h
+++ b/Zend/zend_globals_macros.h
@@ -68,34 +68,6 @@ extern ZEND_API zend_ini_scanner_globals ini_scanner_globals;
 
 END_EXTERN_C()
 
-/* For limited downwards source compatibility */
-#define CLS_FETCH()
-#define ELS_FETCH()
-#define ALS_FETCH()
-#define PLS_FETCH()
-#define SLS_FETCH()
-#define CLS_D
-#define ELS_D
-#define ALS_D
-#define PLS_D
-#define SLS_D
-#define CLS_DC
-#define ELS_DC
-#define ALS_DC
-#define PLS_DC
-#define SLS_DC
-#define CLS_C
-#define ELS_C
-#define ALS_C
-#define PLS_C
-#define SLS_C
-#define CLS_CC
-#define ELS_CC
-#define ALS_CC
-#define PLS_CC
-#define SLS_CC
-
-
 #endif /* ZEND_GLOBALS_MACROS_H */
 
 /*