Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 140901 Details for
Bug 205716
[php-testing overlay] dev-php5/pecl-runkit-0.9-r1 patch typo causes compile failure
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
modified patch for dev-php5/pecl-runkit-0.9-r1
pecl-runkit-0.9-r1-buildfixes.patch (text/plain), 1.52 KB, created by
Austen Dicken
on 2008-01-13 23:08:51 UTC
(
hide
)
Description:
modified patch for dev-php5/pecl-runkit-0.9-r1
Filename:
MIME Type:
Creator:
Austen Dicken
Created:
2008-01-13 23:08:51 UTC
Size:
1.52 KB
patch
obsolete
>--- 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)) { >--- 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_sandbox.c 2007-07-04 17:00:34.711942242 +0200 >+++ runkit_sandbox.c 2007-07-04 17:00:51.652197780 +0200 >@@ -1467,8 +1467,7 @@ > zval *retval; \ > \ > ALLOC_ZVAL(retval); \ >- Z_TYPE_P(retval) = IS_BOOL; \ >- Z_BVAL_P(retval) = objval->name; \ >+ ZVAL_BOOL(retval, objval->name); \ > retval->refcount = 0; \ > retval->is_ref = 0; \ > \ >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 205716
: 140901 |
146408