scottmac Tue Jul 29 01:20:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard crypt_blowfish.c php_crypt_r.h
Log:
Fix build where __const is already defined like OS X.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt_blowfish.c?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/crypt_blowfish.c
diff -u php-src/ext/standard/crypt_blowfish.c:1.1.2.2
php-src/ext/standard/crypt_blowfish.c:1.1.2.3
--- php-src/ext/standard/crypt_blowfish.c:1.1.2.2 Mon Jul 28 11:50:34 2008
+++ php-src/ext/standard/crypt_blowfish.c Tue Jul 29 01:20:28 2008
@@ -1,5 +1,5 @@
/*
- $Id: crypt_blowfish.c,v 1.1.2.2 2008/07/28 11:50:34 pajoye Exp $
+ $Id: crypt_blowfish.c,v 1.1.2.3 2008/07/29 01:20:28 scottmac Exp $
*/
/*
* This code comes from John the Ripper password cracker, with reentrant
@@ -47,6 +47,8 @@
#else
#define __CONST
#endif
+#else
+#define __CONST __const
#endif
#ifdef __i386__
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_crypt_r.h?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/php_crypt_r.h
diff -u php-src/ext/standard/php_crypt_r.h:1.1.2.2
php-src/ext/standard/php_crypt_r.h:1.1.2.3
--- php-src/ext/standard/php_crypt_r.h:1.1.2.2 Mon Jul 28 11:50:34 2008
+++ php-src/ext/standard/php_crypt_r.h Tue Jul 29 01:20:28 2008
@@ -1,4 +1,4 @@
-/* $Id: php_crypt_r.h,v 1.1.2.2 2008/07/28 11:50:34 pajoye Exp $ */
+/* $Id: php_crypt_r.h,v 1.1.2.3 2008/07/29 01:20:28 scottmac Exp $ */
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
@@ -32,6 +32,8 @@
#else
#define __CONST
#endif
+#else
+#define __CONST __const
#endif
void php_init_crypt_r();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
