[xiph-commits] r17380 - branches/lowmem-branch/Tremor

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2010-09-10 16:08:52 -0700 (Fri, 10 Sep 2010)
New Revision: 17380

Modified:
   branches/lowmem-branch/Tremor/floor1.c
Log:
Rename mergesort as it conflicts with <stdlib.h> on the BSDs.


Modified: branches/lowmem-branch/Tremor/floor1.c
===================================================================
--- branches/lowmem-branch/Tremor/floor1.c	2010-09-03 00:14:21 UTC (rev 17379)
+++ branches/lowmem-branch/Tremor/floor1.c	2010-09-10 23:08:52 UTC (rev 17380)
@@ -53,7 +53,7 @@
   return(ret);
 }
 
-static void mergesort(char *index,ogg_uint16_t *vals,ogg_uint16_t n){
+static void vorbis_mergesort(char *index,ogg_uint16_t *vals,ogg_uint16_t n){
   ogg_uint16_t i,j;
   char *temp,*A=index,*B=_ogg_malloc(n*sizeof(*B));
 
@@ -147,7 +147,7 @@
 
   /* also store a sorted position index */
   for(j=0;j<info->posts;j++)info->forward_index[j]=j;
-  mergesort(info->forward_index,info->postlist,info->posts);
+  vorbis_mergesort(info->forward_index,info->postlist,info->posts);
   
   /* discover our neighbors for decode where we don't use fit flags
      (that would push the neighbors outward) */