bjori           Wed Dec 31 14:46:38 2008 UTC

  Modified files:              
    /php-src/sapi/apache2handler        apache_config.c 
  Log:
  MFB: Nuke unused variables
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/apache_config.c?r1=1.17&r2=1.18&diff_format=u
Index: php-src/sapi/apache2handler/apache_config.c
diff -u php-src/sapi/apache2handler/apache_config.c:1.17 
php-src/sapi/apache2handler/apache_config.c:1.18
--- php-src/sapi/apache2handler/apache_config.c:1.17    Wed Dec 31 11:12:39 2008
+++ php-src/sapi/apache2handler/apache_config.c Wed Dec 31 14:46:38 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: apache_config.c,v 1.17 2008/12/31 11:12:39 sebastian Exp $ */
+/* $Id: apache_config.c,v 1.18 2008/12/31 14:46:38 bjori Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -138,11 +138,13 @@
 void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf)
 {
        php_conf_rec *d = base_conf, *e = new_conf, *n = NULL;
+#if STAS_0
        php_dir_entry *pe;
        php_dir_entry *data;
        zstr str;
        uint str_len;
        ulong num_index;
+#endif
 
        n = create_php_config(p, "merge_php_config");
        /* copy old config */



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

Reply via email to