From d1d6f6da414adfa0dff5bb283b23d99676d309b0 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 15 Apr 2016 16:11:14 +0200 Subject: [PATCH 1/2] Fixed: Creation of sn_0_* folders under OS X 10.7 --HG-- branch : develop --- code/nel/src/misc/cmd_args.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/nel/src/misc/cmd_args.cpp b/code/nel/src/misc/cmd_args.cpp index 65aae5769..0abe8e5ce 100644 --- a/code/nel/src/misc/cmd_args.cpp +++ b/code/nel/src/misc/cmd_args.cpp @@ -220,6 +220,11 @@ bool CCmdArgs::parse(int argc, char **argv) for(sint i = 0; i < argc; ++i) { +#ifdef NL_OS_MAC + // get rid of -psn_* arguments under OS X + if (strncmp(argv[i], "-psn_", 5) == 0) continue; +#endif + args.push_back(argv[i]); } From ccb69f8b27d6cbd17530c20ed78237e38e2a33f2 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 15 Apr 2016 16:11:37 +0200 Subject: [PATCH 2/2] Changed: Signed/unsigned comparison --HG-- branch : develop --- code/nel/src/misc/cmd_args.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/src/misc/cmd_args.cpp b/code/nel/src/misc/cmd_args.cpp index 0abe8e5ce..d9370b831 100644 --- a/code/nel/src/misc/cmd_args.cpp +++ b/code/nel/src/misc/cmd_args.cpp @@ -250,7 +250,7 @@ bool CCmdArgs::parse(const std::vector &argv) uint argc = argv.size(); // process each argument - for (sint i = 1; i < argc; i++) + for (uint i = 1; i < argc; i++) { std::string name = argv[i];