You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sa...@locus.apache.org on 2000/04/30 05:11:43 UTC

cvs commit: apache-2.0/src/lib/apr/shmem/unix/mm mm.h

sascha      00/04/29 20:11:43

  Modified:    src      CHANGES
               src/lib/apr/shmem/unix/mm mm.h
  Log:
  Fix mm's memcpy/memset macros; pointer arithmetic was broken.
  Patch submitted to author.
  
  Revision  Changes    Path
  1.93      +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -u -r1.92 -r1.93
  --- CHANGES	2000/04/30 03:01:35	1.92
  +++ CHANGES	2000/04/30 03:11:42	1.93
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0a4-dev
  +  *) Fix mm's memcpy/memset macros, pointer arithmetic was broken.
  +     Patch submitted to author.
  +     [Sascha Schumann]
  +
     *) Fix mm configuration on Solaris 8 x86 and OS/390.  Don't require
        /sbin in PATH on FreeBSD (all submitted to rse previously) 
        [Jeff Trawick]
  
  
  
  1.7       +2 -2      apache-2.0/src/lib/apr/shmem/unix/mm/mm.h
  
  Index: mm.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- mm.h	2000/04/30 03:01:36	1.6
  +++ mm.h	2000/04/30 03:11:43	1.7
  @@ -122,12 +122,12 @@
   #define memcpy(to,from,len) bcopy(from,to,len)
   #else
   #define memcpy(to,from,len) \
  -        { int i; for (i = 0; i < (len); i++) *((to)+i) = *((from)+i); }
  +        { int i; for (i = 0; i < (len); i++) *((char *)(to)+i) = *((char *)(from)+i); }
   #endif
   #endif
   #if !defined(HAVE_MEMSET)
   #define memset(to,ch,len) \
  -        { int i; for (i = 0; i < (len); i++) *((to)+i) = (ch); }
  +        { int i; for (i = 0; i < (len); i++) *((char *)(to)+i) = (ch); }
   #endif
   
   #define ERR(type,str)   mm_lib_error_set(type,str)