lytboris                                 Fri, 02 Sep 2011 08:09:23 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=316023

Log:
merge from trunk:
remove php_snmp_get_ce()

Changed paths:
    _U  php/php-src/branches/PHP_5_4/ext/snmp/
    U   php/php-src/branches/PHP_5_4/ext/snmp/php_snmp.h
    U   php/php-src/branches/PHP_5_4/ext/snmp/snmp.c
    _U  php/php-src/branches/PHP_5_4/ext/snmp/tests/


Property changes on: php/php-src/branches/PHP_5_4/ext/snmp
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/php/php-src/trunk/ext/snmp:284726,311033-315236,315606,315608,315862,315924
   + 
/php/php-src/trunk/ext/snmp:284726,311033-315236,315606,315608,315862,315924,316022

Modified: php/php-src/branches/PHP_5_4/ext/snmp/php_snmp.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/snmp/php_snmp.h    2011-09-02 08:07:58 UTC 
(rev 316022)
+++ php/php-src/branches/PHP_5_4/ext/snmp/php_snmp.h    2011-09-02 08:09:23 UTC 
(rev 316023)
@@ -127,7 +127,7 @@
 #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


Modified: php/php-src/branches/PHP_5_4/ext/snmp/snmp.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/snmp/snmp.c        2011-09-02 08:07:58 UTC 
(rev 316022)
+++ php/php-src/branches/PHP_5_4/ext/snmp/snmp.c        2011-09-02 08:09:23 UTC 
(rev 316023)
@@ -124,13 +124,8 @@
 static zend_object_handlers php_snmp_object_handlers;

 /* Class entries */
-zend_class_entry *php_snmp_class_entry;
+zend_class_entry *php_snmp_ce;

-zend_class_entry *php_snmp_get_ce()
-{
-       return php_snmp_class_entry;
-}
-
 /* Class object properties */
 static HashTable php_snmp_properties;

@@ -2330,7 +2325,7 @@
        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);


Property changes on: php/php-src/branches/PHP_5_4/ext/snmp/tests
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/php/php-src/trunk/ext/snmp/tests:284726,311033-315236,315386,315606,315608,315862,315916,315924
   + 
/php/php-src/trunk/ext/snmp/tests:284726,311033-315236,315386,315606,315608,315862,315916,315924,316022

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to