[PHP-DEV] CVS update: php3/functions From: shane (php-dev <email protected>)
Date: 12/20/98

Date: Sunday December 20, 1998 @ 14:00
Author: shane

Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv19353/functions

Modified Files:
        string.c
Log Message:
fix compiler errors in msvc6

Index: php3/functions/string.c
diff -c php3/functions/string.c:1.155 php3/functions/string.c:1.156
*** php3/functions/string.c:1.155 Sun Dec 20 10:44:59 1998
--- php3/functions/string.c Sun Dec 20 14:00:15 1998
***************
*** 30,36 ****
   */
  
  
! /* $Id: string.c,v 1.155 1998/12/20 15:44:59 rasmus Exp $ */
  #ifdef THREAD_SAFE
  #include "tls.h"
  #endif
--- 30,36 ----
   */
  
  
! /* $Id: string.c,v 1.156 1998/12/20 19:00:15 shane Exp $ */
  #ifdef THREAD_SAFE
  #include "tls.h"
  #endif
***************
*** 1236,1245 ****
   */
  
  static inline char *
! _php3_memnstr(void *haystack, char *needle, int needle_len, void *end)
  {
! void *p;
! void *s;
  
          for(p = haystack; p < end - needle_len + 1&&
                          (s = memchr(p, *needle, end - haystack)); p = s + 1) {
--- 1236,1245 ----
   */
  
  static inline char *
! _php3_memnstr(unsigned char *haystack, char *needle, int needle_len, unsigned char *end)
  {
! unsigned char *p=NULL;
! unsigned char *s=NULL;
  
          for(p = haystack; p < end - needle_len + 1&&
                          (s = memchr(p, *needle, end - haystack)); p = s + 1) { 

--
PHP Development Mailing List   http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe <email protected>
For help: php-dev-help <email protected>