com php-src: Remove some dead defines: Zend/zend.h Zend/zend_ compile.h Zend/zend_globals_macros.h
| From: | Nikita Popov | Date: | Sat, 26 Mar 2016 21:45:23 +0000 |
| Subject: | com php-src: Remove some dead defines: Zend/zend.h Zend/zend_ compile.h Zend/zend_globals_macros.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91491@lists.php.net to get a copy of this message | ||
Commit: 556827dec93d9b9247999ddfa5da70e9593c5a74
Author: Nikita Popov <nikic@php.net> Sat, 26 Mar 2016 01:48:03 +0100
Parents: dab7738f4f24ecfaa6c49f965e9556b5d01897eb
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=556827dec93d9b9247999ddfa5da70e9593c5a74
Log:
Remove some dead defines
Changed paths:
M Zend/zend.h
M Zend/zend_compile.h
M Zend/zend_globals_macros.h
Diff:
diff --git a/Zend/zend.h b/Zend/zend.h
index ca85619..e886ba2 100644
--- 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 ef99cd1..f3dc808 100644
--- 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 d2baef3..c0a9efb 100644
--- 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 */
/*