Index: configure.in
===================================================================
RCS file: /repository/php-src/configure.in,v
retrieving revision 1.579.2.52.2.16
diff -u -r1.579.2.52.2.16 configure.in
--- configure.in	1 Sep 2006 13:55:22 -0000	1.579.2.52.2.16
+++ configure.in	2 Sep 2006 15:42:41 -0000
@@ -492,6 +492,7 @@
 lrand48 \
 memcpy \
 memmove \
+memrchr \
 mkstemp \
 mmap \
 nl_langinfo \
Index: Zend/zend_operators.h
===================================================================
RCS file: /repository/ZendEngine2/zend_operators.h,v
retrieving revision 1.94.2.4.2.4
diff -u -r1.94.2.4.2.4 zend_operators.h
--- Zend/zend_operators.h	8 Aug 2006 10:54:24 -0000	1.94.2.4.2.4
+++ Zend/zend_operators.h	2 Sep 2006 15:42:42 -0000
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <math.h>
 #include <assert.h>
+#include <string.h>
 
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
@@ -169,6 +170,9 @@
 	return NULL;
 }
 
+#ifdef HAVE_MEMRCHR
+# define zend_memrchr(s,c,n) memrchr(s,c,n)
+#else
 static inline void *zend_memrchr(const void *s, int c, size_t n)
 {
 	register unsigned char *e = (unsigned char *)s + n;
@@ -181,6 +185,7 @@
 
 	return NULL;
 }
+#endif
 
 BEGIN_EXTERN_C()
 ZEND_API int increment_function(zval *op1);