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

dmitry		Thu Feb 14 10:25:22 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /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.579.2.52.2.77.2.9&r2=1.579.2.52.2.77.2.10&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.77.2.9 php-src/configure.in:1.579.2.52.2.77.2.10
--- php-src/configure.in:1.579.2.52.2.77.2.9	Wed Feb 13 16:22:01 2008
+++ php-src/configure.in	Thu Feb 14 10:25:22 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.77.2.9 2008/02/13 16:22:01 dmitry Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.77.2.10 2008/02/14 10:25:22 dmitry Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -515,7 +515,6 @@
 lrand48 \
 memcpy \
 memmove \
-memrchr \
 mkstemp \
 mmap \
 nl_langinfo \
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.h?r1=1.94.2.4.2.10.2.4&r2=1.94.2.4.2.10.2.5&diff_format=u
Index: ZendEngine2/zend_operators.h
diff -u ZendEngine2/zend_operators.h:1.94.2.4.2.10.2.4 ZendEngine2/zend_operators.h:1.94.2.4.2.10.2.5
--- ZendEngine2/zend_operators.h:1.94.2.4.2.10.2.4	Wed Feb 13 16:22:01 2008
+++ ZendEngine2/zend_operators.h	Thu Feb 14 10:25:22 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_operators.h,v 1.94.2.4.2.10.2.4 2008/02/13 16:22:01 dmitry Exp $ */
+/* $Id: zend_operators.h,v 1.94.2.4.2.10.2.5 2008/02/14 10:25:22 dmitry Exp $ */
 
 #ifndef ZEND_OPERATORS_H
 #define 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 @@
 	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 @@
 
 	return NULL;
 }
-#endif
 
 BEGIN_EXTERN_C()
 ZEND_API int increment_function(zval *op1);