diff options
| author | Stig Bakken <ssb@php.net> | 2002-07-05 01:52:09 +0000 |
|---|---|---|
| committer | Stig Bakken <ssb@php.net> | 2002-07-05 01:52:09 +0000 |
| commit | 6b4707320da87911dfe16dcf508e2d8fbaa0301b (patch) | |
| tree | 8447d6a3cc9100bd6341a48f1c0e9d925598ae08 /pear/PEAR.php | |
| parent | c6ec8819534053dd4c87147c46dba911035234b6 (diff) | |
| download | php-git-6b4707320da87911dfe16dcf508e2d8fbaa0301b.tar.gz | |
* define PEAR_ZE2 when running with Zend Engine 2
Diffstat (limited to 'pear/PEAR.php')
| -rw-r--r-- | pear/PEAR.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pear/PEAR.php b/pear/PEAR.php index 2f3d71b8dd..8b29290cb9 100644 --- a/pear/PEAR.php +++ b/pear/PEAR.php @@ -26,6 +26,8 @@ define('PEAR_ERROR_PRINT', 2); define('PEAR_ERROR_TRIGGER', 4); define('PEAR_ERROR_DIE', 8); define('PEAR_ERROR_CALLBACK', 16); +define('PEAR_ZE2', (function_exists('version_compare') && + version_compare(zend_version(), "2-dev", "ge"))); if (substr(PHP_OS, 0, 3) == 'WIN') { define('OS_WINDOWS', true); @@ -348,7 +350,7 @@ class PEAR } // }}} - // {{{ _checkDelExpect() + // {{{ _checkDelExpect() /** * This method checks unsets an error code if available @@ -867,9 +869,6 @@ class PEAR_Error $callback, $this->error_message_prefix, $this->userinfo); } - if ($this->mode & PEAR_ERROR_CALLBACK) { - $modes[] = 'callback'; - } if ($this->mode & PEAR_ERROR_PRINT) { $modes[] = 'print'; } |