summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-02-06 08:38:09 +0000
committertron <tron@openttd.org>2005-02-06 08:38:09 +0000
commit7dd78479cc76a768e4941d76a90385e5e48902e4 (patch)
tree565009fc791efe403a4156315a5d34eceb8fd468
parentd3f84347ac934fa3b86f55df4dee135f6e1259ee (diff)
downloadopenttd-7dd78479cc76a768e4941d76a90385e5e48902e4.tar.xz
(svn r1814) Let ReadFileToMem() return void* (instead of byte*) because we don't know what the caller wants to do with the data
-rw-r--r--functions.h2
-rw-r--r--ttd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/functions.h b/functions.h
index 2659b4bf4..04d255f29 100644
--- a/functions.h
+++ b/functions.h
@@ -257,7 +257,7 @@ void GameSizeChanged(void);
bool FileExists(const char *filename);
bool ReadLanguagePack(int index);
void InitializeLanguagePacks(void);
-byte *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize);
+void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize);
int GetLanguageList(char **languages, int max);
void CheckSwitchToEuro(void);
diff --git a/ttd.c b/ttd.c
index 46e9b2d10..07544364b 100644
--- a/ttd.c
+++ b/ttd.c
@@ -218,7 +218,7 @@ static char *strecpy(char *dst, const char *src)
return dst - 1;
}
-byte *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize)
+void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize)
{
FILE *in;
byte *mem;