From 513f363ea05e9c9cf77588eb86dd4984f8aad60d Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Sat, 14 Apr 2012 11:58:52 +0000 Subject: Silencing some compiler warnings on Windows argv is defined as "char *" here so that unicode magic can happen causing problems later on when "const char**" is expected instead. While this fix is redundant on other platforms, it's a lot less confusing than some of the alternative fixes. --- source/creator/creator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/creator/creator.c b/source/creator/creator.c index 308cdab9726..1093f71260c 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1256,7 +1256,7 @@ int main(int argc, const char **argv) #endif /* first test for background */ - ba = BLI_argsInit(argc, argv); /* skip binary path */ + ba = BLI_argsInit(argc, (const char **)argv); /* skip binary path */ setupArguments(C, ba, &syshandle); BLI_argsParse(ba, 1, NULL, NULL); @@ -1281,7 +1281,7 @@ int main(int argc, const char **argv) BLI_argsParse(ba, 2, NULL, NULL); BLI_argsParse(ba, 3, NULL, NULL); - WM_init(C, argc, argv); + WM_init(C, argc, (const char **)argv); /* this is properly initialized with user defs, but this is default */ /* call after loading the startup.blend so we can read U.tempdir */ @@ -1294,7 +1294,7 @@ int main(int argc, const char **argv) else { BLI_argsParse(ba, 3, NULL, NULL); - WM_init(C, argc, argv); + WM_init(C, argc, (const char **)argv); /* don't use user preferences temp dir */ BLI_init_temporary_dir(NULL); -- cgit v1.2.3