summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in5
-rw-r--r--ext/pcre/php_pcre.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 575fcd6233..068a23fe61 100644
--- a/configure.in
+++ b/configure.in
@@ -193,7 +193,10 @@ AC_CHECK_LIB(m, sin)
AC_CHECK_LIB(bind, inet_aton, [
AC_ADD_LIBRARY(bind)
- AC_DEFINE(HAVE_LIBBIND) ], [])
+ AC_DEFINE(HAVE_LIBBIND) ], [
+ AC_CHECK_LIB(bind, __inet_aton, [
+ AC_ADD_LIBRARY(bind)
+ AC_DEFINE(HAVE_LIBBIND) ], []) ])
AC_CHECK_LIB(resolv, inet_aton)
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 2d0bd9107b..310a996b6d 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -22,7 +22,7 @@
TODO:
- Allow user to set PCRE_NOTEMPTY, PCRE_ANCHORED at execution time
- Make new modifier, similar to /e, that passes matches to
- a user-defined function
+ a user-defined function
*/
#include "php.h"