| Antony Dovgal 2006-08-08, 7:56 am |
| tony2001 Tue Aug 8 10:53:06 2006 UTC
Modified files:
/php-src configure.in
/ZendEngine2 zend_operators.h
Log:
there is no realiable way to detect memrchr() presence because of a mess in glibc
so let's use our own implementation
http://cvs.php.net/viewvc.cgi/php-s...1&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.610 php-src/configure.in:1.611
--- php-src/configure.in:1.610 Tue Aug 8 09:40:50 2006
+++ php-src/configure.in Tue Aug 8 10:53:06 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.610 2006/08/08 09:40:50 tony2001 Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.611 2006/08/08 10:53:06 tony2001 Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -489,7 +489,6 @@
lrand48 \
memcpy \
memmove \
-memrchr \
mkstemp \
mmap \
nl_langinfo \
http://cvs.php.net/viewvc.cgi/ZendE...2&diff_format=u
Index: ZendEngine2/zend_operators.h
diff -u ZendEngine2/zend_operators.h:1.111 ZendEngine2/zend_operators.h:1.112
--- ZendEngine2/zend_operators.h:1.111 Tue Aug 8 09:40:50 2006
+++ ZendEngine2/zend_operators.h Tue Aug 8 10:53:06 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.h,v 1.111 2006/08/08 09:40:50 tony2001 Exp $ */
+/* $Id: zend_operators.h,v 1.112 2006/08/08 10:53:06 tony2001 Exp $ */
#ifndef ZEND_OPERATORS_H
#define ZEND_OPERATORS_H
@@ -233,16 +233,6 @@
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;
@@ -255,7 +245,6 @@
return NULL;
}
-#endif
BEGIN_EXTERN_C()
ZEND_API int increment_function(zval *op1);
|