mike                                     Fri, 30 Dec 2011 09:20:07 +0000

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

Log:
follow naming convention

Changed paths:
    U   php/php-src/branches/PHP_5_4/main/output.c
    U   php/php-src/branches/PHP_5_4/main/php_output.h
    U   php/php-src/trunk/main/output.c
    U   php/php-src/trunk/main/php_output.h

Modified: php/php-src/branches/PHP_5_4/main/output.c
===================================================================
--- php/php-src/branches/PHP_5_4/main/output.c  2011-12-30 08:50:49 UTC (rev 
321550)
+++ php/php-src/branches/PHP_5_4/main/output.c  2011-12-30 09:20:07 UTC (rev 
321551)
@@ -338,6 +338,14 @@
 }
 /* }}} */

+/* {{{ php_output_handler* php_output_get_active_handler(TSRMLS_D)
+ * Get active output handler */
+PHPAPI php_output_handler* php_output_get_active_handler(TSRMLS_D)
+{
+       return OG(active);
+}
+/* }}} */
+
 /* {{{ SUCCESS|FAILURE php_output_handler_start_default(TSRMLS_D)
  * Start a "default output handler" */
 PHPAPI int php_output_start_default(TSRMLS_D)
@@ -1502,14 +1510,6 @@
 }
 /* }}} */

-/* {{{ php_output_handler* php_get_active_output_handler(TSRMLS_D)
- * Get active output handler */
-PHPAPI php_output_handler* php_get_active_output_handler(TSRMLS_D)
-{
-       return OG(active);
-}
-/* }}} */
-
 /*
  * Local variables:
  * tab-width: 4

Modified: php/php-src/branches/PHP_5_4/main/php_output.h
===================================================================
--- php/php-src/branches/PHP_5_4/main/php_output.h      2011-12-30 08:50:49 UTC 
(rev 321550)
+++ php/php-src/branches/PHP_5_4/main/php_output.h      2011-12-30 09:20:07 UTC 
(rev 321551)
@@ -219,6 +219,7 @@
 PHPAPI int php_output_get_contents(zval *p TSRMLS_DC);
 PHPAPI int php_output_get_length(zval *p TSRMLS_DC);
 PHPAPI int php_output_get_level(TSRMLS_D);
+PHPAPI php_output_handler* php_output_get_active_handler(TSRMLS_D);

 PHPAPI int php_output_start_default(TSRMLS_D);
 PHPAPI int php_output_start_devnull(TSRMLS_D);
@@ -242,7 +243,6 @@

 PHPAPI php_output_handler_alias_ctor_t *php_output_handler_alias(const char 
*handler_name, size_t handler_name_len TSRMLS_DC);
 PHPAPI int php_output_handler_alias_register(const char *handler_name, size_t 
handler_name_len, php_output_handler_alias_ctor_t func TSRMLS_DC);
-PHPAPI php_output_handler* php_get_active_output_handler(TSRMLS_D);

 END_EXTERN_C()


Modified: php/php-src/trunk/main/output.c
===================================================================
--- php/php-src/trunk/main/output.c     2011-12-30 08:50:49 UTC (rev 321550)
+++ php/php-src/trunk/main/output.c     2011-12-30 09:20:07 UTC (rev 321551)
@@ -338,6 +338,14 @@
 }
 /* }}} */

+/* {{{ php_output_handler* php_output_get_active_handler(TSRMLS_D)
+ * Get active output handler */
+PHPAPI php_output_handler* php_output_get_active_handler(TSRMLS_D)
+{
+       return OG(active);
+}
+/* }}} */
+
 /* {{{ SUCCESS|FAILURE php_output_handler_start_default(TSRMLS_D)
  * Start a "default output handler" */
 PHPAPI int php_output_start_default(TSRMLS_D)
@@ -1502,14 +1510,6 @@
 }
 /* }}} */

-/* {{{ php_output_handler* php_get_active_output_handler(TSRMLS_D)
- * Get active output handler */
-PHPAPI php_output_handler* php_get_active_output_handler(TSRMLS_D)
-{
-       return OG(active);
-}
-/* }}} */
-
 /*
  * Local variables:
  * tab-width: 4

Modified: php/php-src/trunk/main/php_output.h
===================================================================
--- php/php-src/trunk/main/php_output.h 2011-12-30 08:50:49 UTC (rev 321550)
+++ php/php-src/trunk/main/php_output.h 2011-12-30 09:20:07 UTC (rev 321551)
@@ -219,6 +219,7 @@
 PHPAPI int php_output_get_contents(zval *p TSRMLS_DC);
 PHPAPI int php_output_get_length(zval *p TSRMLS_DC);
 PHPAPI int php_output_get_level(TSRMLS_D);
+PHPAPI php_output_handler* php_output_get_active_handler(TSRMLS_D);

 PHPAPI int php_output_start_default(TSRMLS_D);
 PHPAPI int php_output_start_devnull(TSRMLS_D);
@@ -242,7 +243,6 @@

 PHPAPI php_output_handler_alias_ctor_t *php_output_handler_alias(const char 
*handler_name, size_t handler_name_len TSRMLS_DC);
 PHPAPI int php_output_handler_alias_register(const char *handler_name, size_t 
handler_name_len, php_output_handler_alias_ctor_t func TSRMLS_DC);
-PHPAPI php_output_handler* php_get_active_output_handler(TSRMLS_D);

 END_EXTERN_C()


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

Reply via email to