scottmac                                 Wed, 12 Aug 2009 09:18:41 +0000

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

Log:
Fix build on platforms where crypt isn't always available

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
    U   php/php-src/trunk/ext/standard/basic_functions.c

Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2009-08-12 
08:40:05 UTC (rev 287150)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2009-08-12 
09:18:41 UTC (rev 287151)
@@ -3678,7 +3678,9 @@
 #if defined(HAVE_LOCALECONV) && defined(ZTS)
        PHP_MSHUTDOWN(localeconv)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
 #endif
+#if HAVE_CRYPT
        PHP_MSHUTDOWN(crypt)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+#endif

        return SUCCESS;
 }

Modified: php/php-src/trunk/ext/standard/basic_functions.c
===================================================================
--- php/php-src/trunk/ext/standard/basic_functions.c    2009-08-12 08:40:05 UTC 
(rev 287150)
+++ php/php-src/trunk/ext/standard/basic_functions.c    2009-08-12 09:18:41 UTC 
(rev 287151)
@@ -3671,7 +3671,9 @@
 #if defined(HAVE_LOCALECONV) && defined(ZTS)
        PHP_MSHUTDOWN(localeconv)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
 #endif
+#if HAVE_CRYPT
        PHP_MSHUTDOWN(crypt)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+#endif

        return SUCCESS;
 }

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

Reply via email to