From 09c084e77609f9cf839127a2f2c871f90bddcfa3 Mon Sep 17 00:00:00 2001
From: derselbst <tom.mbrt@googlemail.com>
Date: Sat, 25 Nov 2017 20:41:31 +0100
Subject: [PATCH] fix build

---
 src/sfloader/fluid_defsfont.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/sfloader/fluid_defsfont.c b/src/sfloader/fluid_defsfont.c
index 017bfda5..174d5dd1 100644
--- a/src/sfloader/fluid_defsfont.c
+++ b/src/sfloader/fluid_defsfont.c
@@ -2060,7 +2060,6 @@ fluid_sample_import_sfont(fluid_sample_t* sample, SFSample* sfsample, fluid_defs
 
 #define READCHUNK(var,fd, fcbs)	do {		\
 	if (!safe_fread(var, 8, fd, fcbs))			\
-<<<<<<< HEAD:src/sfloader/fluid_defsfont.c
 		return(FAIL);				\
 	((SFChunk *)(var))->size = FLUID_LE32TOH(((SFChunk *)(var))->size);  \
 } while(0)
@@ -2117,7 +2116,7 @@ static int chunkid (unsigned int id);
 static int load_body (unsigned int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs);
 static int read_listchunk (SFChunk * chunk, void * fd, fluid_file_callbacks_t* fcbs);
 static int process_info (int size, SFData * sf, void* fd, fluid_file_callbacks_t* fcbs);
-static int process_sdta (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs);
+static int process_sdta (unsigned int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs);
 static int pdtahelper (unsigned int expid, unsigned int reclen, SFChunk * chunk,
   int * size, void * fd, fluid_file_callbacks_t* fcbs);
 static int process_pdta (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs);
@@ -2385,7 +2384,7 @@ process_info (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
 }
 
 static int
-process_sdta (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
+process_sdta (unsigned int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
 {
   SFChunk chunk;