[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11669] branches/soc-2007-joeedh/source/ blender/blenlib/intern/util.c: Changed a void* to a char* to make msvc happy.
Joseph Eagar
joeedh at gmail.com
Sun Aug 19 05:48:57 CEST 2007
Revision: 11669
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11669
Author: joeedh
Date: 2007-08-19 05:48:56 +0200 (Sun, 19 Aug 2007)
Log Message:
-----------
Changed a void* to a char* to make msvc happy.
Joe
Modified Paths:
--------------
branches/soc-2007-joeedh/source/blender/blenlib/intern/util.c
Modified: branches/soc-2007-joeedh/source/blender/blenlib/intern/util.c
===================================================================
--- branches/soc-2007-joeedh/source/blender/blenlib/intern/util.c 2007-08-19 03:29:51 UTC (rev 11668)
+++ branches/soc-2007-joeedh/source/blender/blenlib/intern/util.c 2007-08-19 03:48:56 UTC (rev 11669)
@@ -1594,7 +1594,7 @@
_MEMCPY(a, b, len)\
_MEMCPY(b, scratch, len) }
-static void bli_qsort_recurse(char *scratch, void *array1, int left, int right, int elemsize, int (*comparitor)(const void *a1, const void *a2))
+static void bli_qsort_recurse(char *scratch, char *array1, int left, int right, int elemsize, int (*comparitor)(const void *a1, const void *a2))
{
if (right > left) {
int pivot = (right+left)/2; //(float)(right+left)*qsort_randtable[(left+right) % QRANDLEN];
@@ -1623,7 +1623,7 @@
if (elemsize > 8096) working_mem = malloc(elemsize);
else working_mem = stack_mem;
- bli_qsort_recurse(working_mem, array1, 0, len-1, elemsize, comparitor);
+ bli_qsort_recurse(working_mem, (char*)array1, 0, len-1, elemsize, comparitor);
if (elemsize > 8096) free(working_mem);
}
\ No newline at end of file
More information about the Bf-blender-cvs
mailing list