cvs: pecl /runkit php_runkit.h runkit.c runkit_filter.c

pollita         Tue Jul 26 13:33:51 2005 EDT

  Modified files:              
    /pecl/runkit        runkit.c php_runkit.h runkit_filter.c 
  Log:
  On Win32 (possibly other systems), symbols must be explicitly exported.
  
  In order to get php_plain_files_wrapper, just locate_url_wrapper
  with a static "file://" path and an IGNORE_URL for good measure.
  
  
http://cvs.php.net/diff.php/pecl/runkit/runkit.c?r1=1.8&r2=1.9&ty=u
Index: pecl/runkit/runkit.c
diff -u pecl/runkit/runkit.c:1.8 pecl/runkit/runkit.c:1.9
--- pecl/runkit/runkit.c:1.8    Sat Jul 23 20:05:39 2005
+++ pecl/runkit/runkit.c        Tue Jul 26 13:33:50 2005
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: runkit.c,v 1.8 2005/07/24 00:05:39 pollita Exp $ */
+/* $Id: runkit.c,v 1.9 2005/07/26 17:33:50 pollita Exp $ */
 
 #include "php_runkit.h"
 ZEND_DECLARE_MODULE_GLOBALS(runkit)
@@ -194,6 +194,11 @@
        REGISTER_LONG_CONSTANT("RUNKIT_FILTER_EREGI",                   
PHP_RUNKIT_FILTER_EREGI,                        CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("RUNKIT_FILTER_PREG",                    
PHP_RUNKIT_FILTER_PREG,                         CONST_CS | CONST_PERSISTENT);
 
+#if PHP_MAJOR_VERSION > 4 || (PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION >= 3)
+       /* plain files wrapper isn't exported, get it the hard way */
+       php_runkit_plainfiles_wrapper_ptr = 
php_stream_locate_url_wrapper("file://", NULL, IGNORE_URL TSRMLS_CC);
+#endif
+
 #ifdef PHP_RUNKIT_SANDBOX
        return php_runkit_init_sandbox(INIT_FUNC_ARGS_PASSTHRU);
 #else
http://cvs.php.net/diff.php/pecl/runkit/php_runkit.h?r1=1.8&r2=1.9&ty=u
Index: pecl/runkit/php_runkit.h
diff -u pecl/runkit/php_runkit.h:1.8 pecl/runkit/php_runkit.h:1.9
--- pecl/runkit/php_runkit.h:1.8        Sat Jul 23 20:05:39 2005
+++ pecl/runkit/php_runkit.h    Tue Jul 26 13:33:50 2005
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_runkit.h,v 1.8 2005/07/24 00:05:39 pollita Exp $ */
+/* $Id: php_runkit.h,v 1.9 2005/07/26 17:33:50 pollita Exp $ */
 
 #ifndef PHP_RUNKIT_H
 #define PHP_RUNKIT_H
@@ -180,6 +180,10 @@
 #define PHP_RUNKIT_DEL_MAGIC_METHOD(ce, fe)
 #endif
 
+#if PHP_MAJOR_VERSION > 4 || (PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION >= 3)
+extern php_stream_wrapper *php_runkit_plainfiles_wrapper_ptr;
+#endif
+
 /* Expects: void
  * If a typecast is possible, convert, if not: default */
 #define PHP_RUNKIT_FILTER_NULL                         0x0001
http://cvs.php.net/diff.php/pecl/runkit/runkit_filter.c?r1=1.1&r2=1.2&ty=u
Index: pecl/runkit/runkit_filter.c
diff -u pecl/runkit/runkit_filter.c:1.1 pecl/runkit/runkit_filter.c:1.2
--- pecl/runkit/runkit_filter.c:1.1     Sat Jul 23 20:05:39 2005
+++ pecl/runkit/runkit_filter.c Tue Jul 26 13:33:50 2005
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: runkit_filter.c,v 1.1 2005/07/24 00:05:39 pollita Exp $ */
+/* $Id: runkit_filter.c,v 1.2 2005/07/26 17:33:50 pollita Exp $ */
 
 #include "php_runkit.h"
 #include "main/php_streams.h"
@@ -40,7 +40,7 @@
 #endif
 
 #if PHP_MAJOR_VERSION > 4 || (PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION >= 3)
-extern php_stream_wrapper php_plain_files_wrapper;
+php_stream_wrapper *php_runkit_plainfiles_wrapper_ptr;
 #endif
 
 static int php_runkit_filter_parse_parameters(int argc TSRMLS_DC, HashTable 
**symtable, char **variable, int *variable_len, zval **def, zval ****filters)
@@ -323,7 +323,7 @@
                                }
 
                                wrapper = 
php_stream_locate_url_wrapper(Z_STRVAL_P(var), NULL, 0 TSRMLS_CC);
-                               if (!wrapper || wrapper == 
&php_plain_files_wrapper) {
+                               if (!wrapper || wrapper == 
php_runkit_plainfiles_wrapper_ptr) {
                                        goto use_default;
                                }
                                break;