cvs: php4 /ext/ming ming.c
| From: | Jani Taskinen | Date: | Wed, 12 Dec 2001 15:32:07 +0000 |
| Subject: | cvs: php4 /ext/ming ming.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8586@lists.php.net to get a copy of this message | ||
sniper Wed Dec 12 10:32:07 2001 EDT
Modified files:
/php4/ext/ming ming.c
Log:
More ZTS fixes.
Index: php4/ext/ming/ming.c
diff -u php4/ext/ming/ming.c:1.24 php4/ext/ming/ming.c:1.25
--- php4/ext/ming/ming.c:1.24 Wed Dec 12 10:04:22 2001
+++ php4/ext/ming/ming.c Wed Dec 12 10:32:07 2001
@@ -104,10 +104,6 @@
static int le_swfspritep;
static int le_swfinputp;
-static int le_fopen;
-static int le_socket;
-static int le_popen;
-
zend_class_entry movie_class_entry;
zend_class_entry shape_class_entry;
zend_class_entry fill_class_entry;
@@ -189,7 +185,7 @@
/* }}} */
/* {{{ getInput - utility func for making an SWFInput from an fopened resource */
-static void destroy_SWFInput_resource(zend_rsrc_list_entry *resource)
+static void destroy_SWFInput_resource(zend_rsrc_list_entry *resource TSRMLS_DC)
{
destroySWFInput((SWFInput)resource->ptr);
}
@@ -229,7 +225,7 @@
file = (FILE *) zend_fetch_resource(zfile TSRMLS_CC, -1, "File-Handle", &type, 3,
php_file_le_fopen(), php_file_le_popen(), php_file_le_socket());
- if(type == le_socket)
+ if(type == php_file_le_socket())
input = newSWFInput_sock(*(int *)file);
else
{
@@ -3038,10 +3034,6 @@
PHP_MINIT_FUNCTION(ming)
{
Ming_setErrorFunction(php_ming_error);
-
- le_fopen = php_file_le_fopen();
- le_popen = php_file_le_popen();
- le_socket = php_file_le_socket();
#define CONSTANT(s,c) REGISTER_LONG_CONSTANT((s), (c), CONST_CS | CONST_PERSISTENT)