diff options
author | Tim Terriberry <tterribe@xiph.org> | 2010-09-10 23:08:52 +0000 |
---|---|---|
committer | Tim Terriberry <tterribe@xiph.org> | 2010-09-10 23:08:52 +0000 |
commit | 1eb218e4c01d2c1faff69b76b7c056bac835ec3c (patch) | |
tree | ba28902fd04c22a06ed2dcb82b6fe71ea62b8d37 | |
parent | 7aac44ff404afa68518d4f5c554eff0f0ee2ddce (diff) | |
download | tremor-1eb218e4c01d2c1faff69b76b7c056bac835ec3c.tar.gz |
Rename mergesort as it conflicts with <stdlib.h> on the BSDs.
git-svn-id: https://svn.xiph.org/branches/lowmem-branch/Tremor@17380 0101bb08-14d6-0310-b084-bc0e0c8e3800
-rw-r--r-- | floor1.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -53,7 +53,7 @@ static int ilog(unsigned int v){ 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 @@ vorbis_info_floor *floor1_info_unpack (vorbis_info *vi,oggpack_buffer *opb){ /* 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) */ |