- Move compat macros to php3_compat.h

diff --git a/main/php.h b/main/php.h
index db43b606e1d6b97033f130eaa024838ceb81f3fc..0fa464dc1412dc18bb4b1a5b51a50dabe9a9bbbb 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -140,11 +140,6 @@ typedef unsigned int socklen_t;
 #include "zend_alloc.h"
 #include "zend_stack.h"
 
-typedef zval pval;
-
-#define pval_copy_constructor  zval_copy_ctor
-#define pval_destructor                        zval_dtor
-
 #if STDC_HEADERS
 # include <string.h>
 #else

diff --git a/main/php3_compat.h b/main/php3_compat.h
index 3171aea5d65566cc087e89d24f81ea72eccf5efb..4093a79a906346e386acf3311a3068c2da61a970 100644 (file)
--- a/main/php3_compat.h
+++ b/main/php3_compat.h
@@ -1,6 +1,11 @@
 #ifndef PHP3_COMPAT_H
 #define PHP3_COMPAT_H
 
+typedef zval pval;
+
+#define pval_copy_constructor zval_copy_ctor
+#define pval_destructor        zval_dtor
+
 #define _php3_hash_init zend_hash_init
 #define _php3_hash_destroy zend_hash_destroy