Skip to content

Commit fb50ef1

Browse files
committed
Reverted memrchr() patch, because it is broken on linux 64-bit
1 parent 0f13364 commit fb50ef1

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

Zend/zend_operators.h

-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <errno.h>
2626
#include <math.h>
2727
#include <assert.h>
28-
#include <string.h>
2928

3029
#ifdef HAVE_IEEEFP_H
3130
#include <ieeefp.h>
@@ -240,9 +239,6 @@ zend_memnstr(char *haystack, char *needle, int needle_len, char *end)
240239
return NULL;
241240
}
242241

243-
#ifdef HAVE_MEMRCHR
244-
# define zend_memrchr(s,c,n) memrchr(s,c,n)
245-
#else
246242
static inline void *zend_memrchr(const void *s, int c, size_t n)
247243
{
248244
register unsigned char *e;
@@ -259,7 +255,6 @@ static inline void *zend_memrchr(const void *s, int c, size_t n)
259255

260256
return NULL;
261257
}
262-
#endif
263258

264259
BEGIN_EXTERN_C()
265260
ZEND_API int increment_function(zval *op1);

configure.in

-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,6 @@ lchown \
515515
lrand48 \
516516
memcpy \
517517
memmove \
518-
memrchr \
519518
mkstemp \
520519
mmap \
521520
nl_langinfo \

0 commit comments

Comments
 (0)