Reverted memrchr() patch, because it is broken on linux 64-bit

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 7be7b77596cc2f3851e7e59827c8db671399f2ba..1bf25ee93e1e4684c5709d65347e60ddac59d68e 100644 (file)
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -25,7 +25,6 @@
 #include <errno.h>
 #include <math.h>
 #include <assert.h>
-#include <string.h>
 
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
@@ -240,9 +239,6 @@ zend_memnstr(char *haystack, char *needle, int needle_len, char *end)
        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;
@@ -259,7 +255,6 @@ static inline void *zend_memrchr(const void *s, int c, size_t n)
 
        return NULL;
 }
-#endif
 
 BEGIN_EXTERN_C()
 ZEND_API int increment_function(zval *op1);

diff --git a/configure.in b/configure.in
index 2c74e09935bfb0cd344fc7ca973a3d7565c5e2a5..e5dff11c713b12ab33dc70fc783cb3d9baf058a2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -515,7 +515,6 @@ lchown \
 lrand48 \
 memcpy \
 memmove \
-memrchr \
 mkstemp \
 mmap \
 nl_langinfo \