rasmus                                   Thu, 19 Jan 2012 22:35:22 +0000

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

Log:
Missing ifdef here
Fixes bug 60811

Bug: https://bugs.php.net/60811 (Open) php-fpm compilation problem
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
    U   php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
    U   php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c        2012-01-19 
22:25:54 UTC (rev 322477)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c        2012-01-19 
22:35:22 UTC (rev 322478)
@@ -1171,7 +1171,9 @@
 {
        char *filename;
        int *error = (int *)arg;;
+#ifdef HAVE_GLOB
        glob_t g;
+#endif
        int i;

        if (!inc || !arg) return;

Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c        2012-01-19 
22:25:54 UTC (rev 322477)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c        2012-01-19 
22:35:22 UTC (rev 322478)
@@ -1171,7 +1171,9 @@
 {
        char *filename;
        int *error = (int *)arg;;
+#ifdef HAVE_GLOB
        glob_t g;
+#endif
        int i;

        if (!inc || !arg) return;

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c   2012-01-19 22:25:54 UTC (rev 
322477)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c   2012-01-19 22:35:22 UTC (rev 
322478)
@@ -1171,7 +1171,9 @@
 {
        char *filename;
        int *error = (int *)arg;;
+#ifdef HAVE_GLOB
        glob_t g;
+#endif
        int i;

        if (!inc || !arg) return;

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

Reply via email to