merge from trunk:

remove php_snmp_get_ce()

diff --git a/ext/snmp/php_snmp.h b/ext/snmp/php_snmp.h
index 543a48689c1aa696913fbe3c0bcfd53face66d32..500d4f8df8d75be6645ccbb8c21d47733b01721a 100644 (file)
--- a/ext/snmp/php_snmp.h
+++ b/ext/snmp/php_snmp.h
@@ -127,7 +127,7 @@ ZEND_END_MODULE_GLOBALS(snmp)
 #endif
 
 #define REGISTER_SNMP_CLASS_CONST_LONG(const_name, value) \
-       zend_declare_class_constant_long(php_snmp_get_ce(), const_name, sizeof(const_name)-1, (long)value TSRMLS_CC);
+       zend_declare_class_constant_long(php_snmp_ce, const_name, sizeof(const_name)-1, (long)value TSRMLS_CC);
 
 #else
 

diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 1d2245070f2c7cc5b6ad07bafe82a4ba9c869550..08a93a60a98835caca18942a0fc724bd74af0292 100644 (file)
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -124,12 +124,7 @@ static int le_snmp_session;
 static zend_object_handlers php_snmp_object_handlers;
 
 /* Class entries */
-zend_class_entry *php_snmp_class_entry;
-
-zend_class_entry *php_snmp_get_ce()
-{
-       return php_snmp_class_entry;
-}
+zend_class_entry *php_snmp_ce;
 
 /* Class object properties */
 static HashTable php_snmp_properties;
@@ -2330,7 +2325,7 @@ PHP_MINIT_FUNCTION(snmp)
        INIT_CLASS_ENTRY(ce, "SNMP", php_snmp_class_methods);
        ce.create_object = php_snmp_object_new;
        php_snmp_object_handlers.clone_obj = NULL;
-       php_snmp_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
+       php_snmp_ce = zend_register_internal_class(&ce TSRMLS_CC);
 
        /* Register SNMP Class properties */
        zend_hash_init(&php_snmp_properties, 0, NULL, NULL, 1);