cvs: embed /php-irssi php-irssi-obj.c

From: Date: Thu, 27 Oct 2005 17:12:57 +0000
Subject: cvs: embed /php-irssi php-irssi-obj.c
Groups: php.embed.cvs 
Request: Send a blank email to [email protected] to get a copy of this message 
wez		Thu Oct 27 13:12:57 2005 EDT

  Modified files:              
    /embed/php-irssi	php-irssi-obj.c 
  Log:
  this might fix a segv when running against 5.1
  
  
http://cvs.php.net/diff.php/embed/php-irssi/php-irssi-obj.c?r1=1.13&r2=1.14&ty=u
Index: embed/php-irssi/php-irssi-obj.c
diff -u embed/php-irssi/php-irssi-obj.c:1.13 embed/php-irssi/php-irssi-obj.c:1.14
--- embed/php-irssi/php-irssi-obj.c:1.13	Wed Mar 17 16:32:12 2004
+++ embed/php-irssi/php-irssi-obj.c	Thu Oct 27 13:12:54 2005
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
   | Author: Wez Furlong <[email protected]>                                    |
   +----------------------------------------------------------------------+
-  $Id: php-irssi-obj.c,v 1.13 2004/03/17 21:32:12 bs Exp $
+  $Id: php-irssi-obj.c,v 1.14 2005/10/27 17:12:54 wez Exp $
 */
 #include "php-irssi.h"
 #include "php-irssi-obj-defs.h"
@@ -148,8 +148,17 @@
 	return NULL;
 }
 
-static union _zend_function* pih_get_method(zval *object, char *method, int method_len TSRMLS_DC)
+static union _zend_function* pih_get_method(
+#if PHP_API_VERSION >= 20041225
+	zval **object_pp,
+#else
+	zval *object,
+#endif
+	char *method, int method_len TSRMLS_DC)
 {
+#if PHP_API_VERSION >= 20041225
+	zval *object = *object_pp;
+#endif
 	struct php_irssi_obj_ref *ref = zend_object_store_get_object(object TSRMLS_CC);
 	zend_function *func_method;

Thread (1 message)

  • Wez Furlong
« previous php.embed.cvs (#97) next »