resolving merge conflict

1 files changed, 4 insertions, 4 deletions

diff --git a/stb_vorbis.c b/stb_vorbis.c
index 822253d..d98b4a8 100644
--- a/stb_vorbis.c
+++ b/stb_vorbis.c
@@ -895,12 +895,12 @@ static void neighbors(uint16 *x, int n, int *plow, int *phigh)
 typedef struct

 {

    uint16 x,y;

-} Point;

+} VorbisPoint;

 

 int point_compare(const void *p, const void *q)

 {

-   Point *a = (Point *) p;

-   Point *b = (Point *) q;

+   VorbisPoint *a = (VorbisPoint *) p;

+   VorbisPoint *b = (VorbisPoint *) q;

    return a->x < b->x ? -1 : a->x > b->x;

 }

 

@@ -3543,7 +3543,7 @@ static int start_decoder(vorb *f)
             g->book_list[j] = get_bits(f,8);

          return error(f, VORBIS_feature_not_supported);

       } else {

-         Point p[31*8+2];

+         VorbisPoint p[31*8+2];

          Floor1 *g = &f->floor_config[i].floor1;

          int max_class = -1; 

          g->partitions = get_bits(f, 5);