[asterisk-scf-commits] asterisk-scf/release/ice.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Fri Sep 9 12:40:59 CDT 2011


branch "master" has been updated
       via  5fc2dceaeb57dfcb9f97a6f1676287e0e701b1c1 (commit)
      from  33a7a2cd2e4009e44cae6a2ed8d88ada0321ff5c (commit)

Summary of changes:
 php/src/IcePHP/Types.cpp |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


- Log -----------------------------------------------------------------
commit 5fc2dceaeb57dfcb9f97a6f1676287e0e701b1c1
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Sep 9 15:10:30 2011 -0230

    Work around a build issue with the unsliceable support when dealing with older versions of php.

diff --git a/php/src/IcePHP/Types.cpp b/php/src/IcePHP/Types.cpp
index 7e319f0..03a9671 100644
--- a/php/src/IcePHP/Types.cpp
+++ b/php/src/IcePHP/Types.cpp
@@ -22,6 +22,16 @@ using namespace IcePHP;
 using namespace IceUtil;
 using namespace IceUtilInternal;
 
+//
+// Work around a missing macro from earlier versions of php.
+//
+#ifndef ZEND_FETCH_RESOURCE_NO_RETURN
+
+#define ZEND_FETCH_RESOURCE_NO_RETURN(rsrc, rsrc_type, passed_id, default_id, resource_type_name, resource_type)	\
+	(rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 1, resource_type))
+
+#endif
+
 ZEND_EXTERN_MODULE_GLOBALS(ice)
 
 

-----------------------------------------------------------------------


-- 
asterisk-scf/release/ice.git



More information about the asterisk-scf-commits mailing list