From 6d0679cbd98a73b69d5926437d8ef0f1d3c2b8ef Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 8 Mar 2015 16:35:49 -0500 Subject: [PATCH] Clean up some int32/long confusion --- dumb/include/dumb.h | 2 +- src/sound/music_dumb.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dumb/include/dumb.h b/dumb/include/dumb.h index 1a17e9039..c2c0aaa32 100644 --- a/dumb/include/dumb.h +++ b/dumb/include/dumb.h @@ -177,7 +177,7 @@ typedef struct DUMBFILE_SYSTEM int32 (DUMBCALLBACK *getnc)(char *ptr, int32 n, void *f); void (DUMBCALLBACK *close)(void *f); int (DUMBCALLBACK *seek)(void *f, long n); - int32 (DUMBCALLBACK *get_size)(void *f); + long (DUMBCALLBACK *get_size)(void *f); } DUMBFILE_SYSTEM; diff --git a/src/sound/music_dumb.cpp b/src/sound/music_dumb.cpp index 3a1651012..33a85caf3 100644 --- a/src/sound/music_dumb.cpp +++ b/src/sound/music_dumb.cpp @@ -509,7 +509,7 @@ static int DUMBCALLBACK dumbfile_mem_seek(void *f, long n) return 0; } -static int32 DUMBCALLBACK dumbfile_mem_get_size(void *f) +static long DUMBCALLBACK dumbfile_mem_get_size(void *f) { dumbfile_mem_status * s = (dumbfile_mem_status *) f; return s->size;