1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00

- Unbreak: fix build with PHP 5.2.0

Obtained from:	vendor CVS
This commit is contained in:
Pav Lucistnik 2006-11-23 00:29:10 +00:00
parent 22b5543798
commit a4c87a9b65
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=177849
2 changed files with 29 additions and 2 deletions

View File

@ -17,8 +17,6 @@ DIST_SUBDIR= PECL
MAINTAINER= pav@FreeBSD.org
COMMENT= PECL extension to modify constants, user-defined functions and classes
BROKEN= Does not compile
USE_PHP= yes
USE_PHPEXT= yes
PHP_MODNAME= runkit

View File

@ -0,0 +1,29 @@
--- php_runkit.h 2006/06/07 17:35:33 1.29
+++ php_runkit.h 2006/10/26 16:18:52 1.30
@@ -40,6 +40,13 @@
#define PHP_RUNKIT_IMPORT_CLASS_PROPS 0x0008
#define PHP_RUNKIT_IMPORT_CLASSES (PHP_RUNKIT_IMPORT_CLASS_METHODS|PHP_RUNKIT_IMPORT_CLASS_CONSTS|PHP_RUNKIT_IMPORT_CLASS_PROPS)
#define PHP_RUNKIT_IMPORT_OVERRIDE 0x0010
+
+#if ZEND_MODULE_API_NO > 20050922
+#define ZEND_ENGINE_2_2
+#endif
+#if ZEND_MODULE_API_NO > 20050921
+#define ZEND_ENGINE_2_1
+#endif
/* The TSRM interpreter patch required by runkit_sandbox was added in 5.1, but this package includes diffs for older versions
* Those diffs include an additional #define to indicate that they've been applied
--- runkit_import.c 2006/06/07 17:35:33 1.9
+++ runkit_import.c 2006/10/26 16:18:52 1.10
@@ -228,7 +228,9 @@
if (zend_hash_get_current_key_ex(&ce->default_properties, &key, &key_len, &idx, 0, &pos) == HASH_KEY_IS_STRING) {
char *cname = NULL, *pname = key;
-#ifdef ZEND_ENGINE_2
+#ifdef ZEND_ENGINE_2_2
+ zend_unmangle_property_name(key, key_len - 1, &cname, &pname);
+#elif defined(ZEND_ENGINE_2)
zend_unmangle_property_name(key, &cname, &pname);
#endif
if (zend_hash_exists(&dce->default_properties, key, key_len)) {