diff options
| author | Dmitry Stogov <dmitry@php.net> | 2008-02-14 10:25:22 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2008-02-14 10:25:22 +0000 |
| commit | fb50ef1aab39d3ef45cacc52ea1541e68d0d7e4c (patch) | |
| tree | 833fbacd7321789f427ed9d63a308df6587bd3b3 | |
| parent | 0f13364729da85e8b6f66b49a7b1fb4cdbe5ef2a (diff) | |
| download | php-git-fb50ef1aab39d3ef45cacc52ea1541e68d0d7e4c.tar.gz | |
Reverted memrchr() patch, because it is broken on linux 64-bit
| -rw-r--r-- | Zend/zend_operators.h | 5 | ||||
| -rw-r--r-- | configure.in | 1 |
2 files changed, 0 insertions, 6 deletions
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 \ |