zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-28 06:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix build

Browse source
This commit is contained in:
derselbst 2017-11-25 20:41:31 +01:00
parent 1e65ba1a49
commit 09c084e776
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/sfloader/fluid_defsfont.c
View file

@ -2060,7 +2060,6 @@ fluid_sample_import_sfont(fluid_sample_t* sample, SFSample* sfsample, fluid_defs
#define READCHUNK(var,fd, fcbs) do { \ #define READCHUNK(var,fd, fcbs) do { \
if (!safe_fread(var, 8, fd, fcbs)) \ if (!safe_fread(var, 8, fd, fcbs)) \
<<<<<<< HEAD:src/sfloader/fluid_defsfont.c
return(FAIL); \ return(FAIL); \
((SFChunk *)(var))->size = FLUID_LE32TOH(((SFChunk *)(var))->size); \ ((SFChunk *)(var))->size = FLUID_LE32TOH(((SFChunk *)(var))->size); \
} while(0) } 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 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 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_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, static int pdtahelper (unsigned int expid, unsigned int reclen, SFChunk * chunk,
int * size, void * fd, fluid_file_callbacks_t* fcbs); int * size, void * fd, fluid_file_callbacks_t* fcbs);
static int process_pdta (int size, SFData * sf, 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 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; SFChunk chunk;