From: Dmitry Stogov <dmitry@php.net>
Date: Thu, 14 Feb 2008 10:25:22 +0000 (+0000)
Subject: Reverted memrchr() patch, because it is broken on linux 64-bit
X-Git-Tag: RELEASE_1_3_1~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb50ef1aab39d3ef45cacc52ea1541e68d0d7e4c;p=php

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

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 7be7b77596..1bf25ee93e 100644
--- 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 2c74e09935..e5dff11c71 100644
--- a/configure.in
+++ b/configure.in
@@ -515,7 +515,6 @@ lchown \
 lrand48 \
 memcpy \
 memmove \
-memrchr \
 mkstemp \
 mmap \
 nl_langinfo \