summaryrefslogtreecommitdiff
path: root/ext/ming
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2001-12-12 15:32:08 +0000
committerfoobar <sniper@php.net>2001-12-12 15:32:08 +0000
commit97a29e07c9c6b1400630b5ec058ab0a6fd77ea40 (patch)
treebb506a4361a21a886dd6c07849b391afdcf2a1b9 /ext/ming
parentbc033a67db882192942703772cb98457921668df (diff)
downloadphp-git-97a29e07c9c6b1400630b5ec058ab0a6fd77ea40.tar.gz
More ZTS fixes.
Diffstat (limited to 'ext/ming')
-rw-r--r--ext/ming/ming.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/ext/ming/ming.c b/ext/ming/ming.c
index 67b706bb61..c15eb8555a 100644
--- a/ext/ming/ming.c
+++ b/ext/ming/ming.c
@@ -104,10 +104,6 @@ static int le_swfmorphp;
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 @@ SWFCharacter getCharacter(zval *id TSRMLS_DC)
/* }}} */
/* {{{ 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 @@ static SWFInput getInput(zval **zfile TSRMLS_DC)
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
{
@@ -3039,10 +3035,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)
/* flags for SWFButton_addShape */