diff options
| author | Steven Fuller <relnev@icculus.org> | 2014-12-25 12:00:00 +0100 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 03:45:24 +0200 |
| commit | 22475d6d94e96056d1550dca00b32d00e3821649 (patch) | |
| tree | 175dbbc8da0704d493fe3cb6024d8117c4f1b27b /src/winfiles.c | |
| parent | 819e239f23b0c515f32fe0ec8350bdfd8d64c9e9 (diff) | |
Import icculus.org release (2014-12-25)
Diffstat (limited to 'src/winfiles.c')
| -rw-r--r-- | src/winfiles.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/winfiles.c b/src/winfiles.c index 8cc87b6..798210d 100644 --- a/src/winfiles.c +++ b/src/winfiles.c @@ -678,7 +678,7 @@ static char* GetLocalDirectory(void) if( homepath != NULL ) { - homedir = (unsigned char*)malloc(strlen(homedrive)+strlen(homepath)+1); + homedir = (char*)malloc(strlen(homedrive)+strlen(homepath)+1); strcpy(homedir, homedrive); strcat(homedir, homepath); @@ -704,7 +704,7 @@ static char* GetLocalDirectory(void) homedir = _strdup("."); } - localdir = (unsigned char*)malloc(strlen(homedir) + 10); + localdir = (char*)malloc(strlen(homedir) + 10); strcpy(localdir, homedir); strcat(localdir, "\\AvPLinux"); // temp name, maybe @@ -762,11 +762,13 @@ static const char* GetGlobalDirectory(const char* argv0) /* Game-specific initialization */ +extern "C" { + extern char const *SecondTex_Directory; + extern char const *SecondSoundDir; +} + void InitGameDirectories(char *argv0) { - extern char *SecondTex_Directory; - extern char *SecondSoundDir; - const char* localdir; const char* globaldir; |