From 8c55ecac749f80d53a7ff807eee563a4a48b72dc Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 9 Mar 2013 13:13:11 +0100 Subject: [PATCH] main.c: Replaced macro with a static const This is the GNU recommended way, and ensures that not-compiled code does not become out of date. --- src/ui/gui/main.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c index 54f90567f6..eb44e813b6 100644 --- a/src/ui/gui/main.c +++ b/src/ui/gui/main.c @@ -249,25 +249,32 @@ static GMemVTable vtable = }; #ifdef __APPLE__ +static const bool apple = true; +#else +static const bool apple = false; +#endif + /* Searches ARGV for the -psn_xxxx option that the desktop application launcher passes in, and removes it if it finds it. Returns the new value of ARGC. */ -static int +static inline int remove_psn (int argc, char **argv) { - int i; - - for (i = 0; i < argc; i++) + if (apple) { - if (!strncmp(argv[i], "-psn", 4)) - { - remove_element (argv, argc + 1, sizeof *argv, i); - return argc - 1; - } + int i; + + for (i = 0; i < argc; i++) + { + if (!strncmp (argv[i], "-psn", 4)) + { + remove_element (argv, argc + 1, sizeof *argv, i); + return argc - 1; + } + } } return argc; } -#endif /* __APPLE__ */ int main (int argc, char *argv[]) @@ -300,9 +307,7 @@ main (int argc, char *argv[]) g_warning ("%s", vers); } -#ifdef __APPLE__ argc = remove_psn (argc, argv); -#endif /* Parse our own options. This must come BEFORE gdk_init otherwise options such as -- 2.30.2