diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-08-08 10:54:24 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-08-08 10:54:24 +0000 |
| commit | 6277ba98d9d1fc8f41f6e32216a9b4cc0a47da34 (patch) | |
| tree | f92bfc70c9bb5b947b672a1f3b8c6eaa49a38eb7 | |
| parent | 1f69ad5aa1d12cf05f9caf7c95e626d2b39dd2f2 (diff) | |
| download | php-git-6277ba98d9d1fc8f41f6e32216a9b4cc0a47da34.tar.gz | |
there is no realiable way to detect memrchr() presence because of a mess in glibc
so let's use our own implementation
| -rw-r--r-- | Zend/zend_operators.h | 11 | ||||
| -rw-r--r-- | configure.in | 1 |
2 files changed, 0 insertions, 12 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 8274332417..c7c3991d57 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -169,16 +169,6 @@ zend_memnstr(char *haystack, char *needle, int needle_len, char *end) return NULL; } -#ifdef HAVE_MEMRCHR -# ifndef __USE_GNU -# define __USE_GNU -# endif - -#include <string.h> -#define zend_memrchr memrchr - -#else - static inline void *zend_memrchr(const void *s, int c, size_t n) { register unsigned char *e = (unsigned char *)s + n; @@ -191,7 +181,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 242b25ab2e..f9df413865 100644 --- a/configure.in +++ b/configure.in @@ -491,7 +491,6 @@ lchown \ lrand48 \ memcpy \ memmove \ -memrchr \ mkstemp \ mmap \ nl_langinfo \ |