| Antony Dovgal 2006-08-08, 7:56 am |
| tony2001 Tue Aug 8 09:41:09 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src configure.in
/ZendEngine2 zend_operators.h
Log:
add zend_memrchr()
http://cvs.php.net/viewvc.cgi/php-s...8&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.7 php-src/configure.in:1.579.2.52.2.8
--- php-src/configure.in:1.579.2.52.2.7 Sun Aug 6 20:46:02 2006
+++ php-src/configure.in Tue Aug 8 09:41:09 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.7 2006/08/06 20:46:02 tony2001 Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.8 2006/08/08 09:41:09 tony2001 Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -491,6 +491,7 @@
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.94.2.4.2.1 ZendEngine2/zend_operators.h:1.94.2.4.2.2
--- ZendEngine2/zend_operators.h:1.94.2.4.2.1 Tue May 9 23:53:23 2006
+++ ZendEngine2/zend_operators.h Tue Aug 8 09:41:09 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.h,v 1.94.2.4.2.1 2006/05/09 23:53:23 helly Exp $ */
+/* $Id: zend_operators.h,v 1.94.2.4.2.2 2006/08/08 09:41:09 tony2001 Exp $ */
#ifndef ZEND_OPERATORS_H
#define ZEND_OPERATORS_H
@@ -160,6 +160,29 @@
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;
+
+ for (e--; e >= (unsigned char *)s; e--) {
+ if (*e == (unsigned char)c) {
+ return (void *)e;
+ }
+ }
+
+ return NULL;
+}
+#endif
BEGIN_EXTERN_C()
ZEND_API int increment_function(zval *op1);
|