summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott MacVicar <scottmac@php.net>2008-07-29 01:20:28 +0000
committerScott MacVicar <scottmac@php.net>2008-07-29 01:20:28 +0000
commite30b104148dc20f0e862abb6593545ae7076faf2 (patch)
treefd4d5dbe0b69cbe30a99379aba0ae90b366694e0
parent2b040f2d66bf1f79a4eae6038b6707d8e6d3fa72 (diff)
downloadphp-git-e30b104148dc20f0e862abb6593545ae7076faf2.tar.gz
Fix build where __const is already defined like OS X.
-rw-r--r--ext/standard/crypt_blowfish.c2
-rw-r--r--ext/standard/php_crypt_r.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/ext/standard/crypt_blowfish.c b/ext/standard/crypt_blowfish.c
index ee956f48a8..f470b66609 100644
--- a/ext/standard/crypt_blowfish.c
+++ b/ext/standard/crypt_blowfish.c
@@ -47,6 +47,8 @@
#else
#define __CONST
#endif
+#else
+#define __CONST __const
#endif
#ifdef __i386__
diff --git a/ext/standard/php_crypt_r.h b/ext/standard/php_crypt_r.h
index ad4e23add5..39456398c1 100644
--- a/ext/standard/php_crypt_r.h
+++ b/ext/standard/php_crypt_r.h
@@ -32,6 +32,8 @@ extern "C"
#else
#define __CONST
#endif
+#else
+#define __CONST __const
#endif
void php_init_crypt_r();