cvs: ZendEngine2 / zend_operators.h php-src configure.in

dmitry		Thu Feb 14 10:25:11 2008 UTC

  Modified files:              
    /php-src	configure.in 
    /ZendEngine2	zend_operators.h 
  Log:
  Reverted memrchr() patch, because it is broken on linux 64-bit
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.645&r2=1.646&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.645 php-src/configure.in:1.646
--- php-src/configure.in:1.645	Wed Feb 13 16:22:12 2008
+++ php-src/configure.in	Thu Feb 14 10:25:10 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.645 2008/02/13 16:22:12 dmitry Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.646 2008/02/14 10:25:10 dmitry Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -514,7 +514,6 @@
 lrand48 \
 memcpy \
 memmove \
-memrchr \
 mkstemp \
 mmap \
 nl_langinfo \
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.h?r1=1.126&r2=1.127&diff_format=u
Index: ZendEngine2/zend_operators.h
diff -u ZendEngine2/zend_operators.h:1.126 ZendEngine2/zend_operators.h:1.127
--- ZendEngine2/zend_operators.h:1.126	Wed Feb 13 16:22:12 2008
+++ ZendEngine2/zend_operators.h	Thu Feb 14 10:25:10 2008
@@ -17,14 +17,13 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_operators.h,v 1.126 2008/02/13 16:22:12 dmitry Exp $ */
+/* $Id: zend_operators.h,v 1.127 2008/02/14 10:25:10 dmitry Exp $ */
 
 #ifndef ZEND_OPERATORS_H
 #define ZEND_OPERATORS_H
 
 #include <errno.h>
 #include <math.h>
-#include <string.h>
 
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
@@ -251,9 +250,6 @@
 	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;
@@ -270,7 +266,6 @@
 
 	return NULL;
 }
-#endif
 
 BEGIN_EXTERN_C()
 ZEND_API int increment_function(zval *op1);