Port "get resource" functions.

1 files changed, 12 insertions, 12 deletions

diff --git a/php_imlib.c b/php_imlib.c
index 85cf9c5..1c32e2d 100644
--- a/php_imlib.c
+++ b/php_imlib.c
@@ -493,19 +493,19 @@ struct php_imlib_filter* _php_imlib_find_filter(char *filter_name TSRMLS_DC)
 	return NULL;
 }
 
-Imlib_Image _php_imlib_get_image(zval** im_resource)
+Imlib_Image _php_imlib_get_image(zval* im_resource)
 {
 	Imlib_Image im;
 	TSRMLS_FETCH();
-	MY_ZEND_FETCH_RESOURCE(im, Imlib_Image, im_resource, -1, "Imlib Image", le_imlib_img);
+	im = (Imlib_Image) zend_fetch_resource(Z_RES_P(im_resource), le_imlib_img_name, le_imlib_img);
 	return im;
 }
 
-Imlib_Filter _php_imlib_get_filter(zval** fil_resource)
+Imlib_Filter _php_imlib_get_filter(zval* fil_resource)
 {
 	Imlib_Filter fil;
 	TSRMLS_FETCH();
-	MY_ZEND_FETCH_RESOURCE(fil, Imlib_Filter, fil_resource, -1, "Imlib Filter", le_imlib_filter);
+	fil = (Imlib_Filter) zend_fetch_resource(Z_RES_P(fil_resource), le_imlib_filter_name, le_imlib_filter);
 	return fil;
 }
 
@@ -530,37 +530,37 @@ void _php_imlib_color_modifier_synch(PHP_Imlib_Color_Modifier cm)
 	imlib_context_set_color_modifier(NULL);
 }
 
-Imlib_Color_Modifier _php_imlib_get_cm(zval** cm_resource)
+Imlib_Color_Modifier _php_imlib_get_cm(zval* cm_resource)
 {
 	PHP_Imlib_Color_Modifier cm;
 	TSRMLS_FETCH();
-	MY_ZEND_FETCH_RESOURCE(cm, Imlib_Color_Modifier, cm_resource, -1, "Imlib Color Modifier", le_imlib_cm);
+	cm = (Imlib_Color_Modifier) zend_fetch_resource(Z_RES_P(cm_resource), le_imlib_cm_name, le_imlib_cm);
 	if (cm->modified) _php_imlib_color_modifier_synch(cm);
 	cm->valid=0;
 	return cm->cm;
 }
 
-Imlib_Font _php_imlib_get_font(zval** font_resource)
+Imlib_Font _php_imlib_get_font(zval* font_resource)
 {
 	PHP_Imlib_Font php_font;
 	TSRMLS_FETCH();
-	MY_ZEND_FETCH_RESOURCE(php_font, PHP_Imlib_Font, font_resource, -1, "Imlib Font", le_imlib_font);
+	php_font = (PHP_Imlib_Font) zend_fetch_resource(Z_RES_P(font_resource), le_imlib_font_name, le_imlib_font);
 	return php_font->font;
 }
 
-Imlib_Color_Range _php_imlib_get_cr(zval** cr_resource)
+Imlib_Color_Range _php_imlib_get_cr(zval* cr_resource)
 {
 	Imlib_Color_Range cr;
 	TSRMLS_FETCH();
-	MY_ZEND_FETCH_RESOURCE(cr, Imlib_Color_Range, cr_resource, -1, "Imlib Color Range", le_imlib_cr);
+	cr = (Imlib_Color_Range) zend_fetch_resource(Z_RES_P(cr_resource), le_imlib_cr_name, le_imlib_cr);
 	return cr;
 }
 
-ImlibPolygon _php_imlib_get_poly(zval** poly_resource)
+ImlibPolygon _php_imlib_get_poly(zval* poly_resource)
 {
 	ImlibPolygon poly;
 	TSRMLS_FETCH();
-	MY_ZEND_FETCH_RESOURCE(poly, ImlibPolygon, poly_resource, -1, "Imlib Polygon", le_imlib_poly);
+	poly = (ImlibPolygon) zend_fetch_resource(Z_RES_P(poly_resource), le_imlib_poly_name, le_imlib_poly);
 	return poly;
 }