diff options
| author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-05-11 18:25:57 +0000 |
|---|---|---|
| committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-05-11 18:25:57 +0000 |
| commit | f3f7749b10f793d5575fb538f76c5dfe04382e16 (patch) | |
| tree | 90a4a555b16ee2a9158fecaedfcaa32a11a72390 /navit | |
| parent | c3b93ef5914361e878a4df31a7aeb9e8730fb9f8 (diff) | |
| download | navit-f3f7749b10f793d5575fb538f76c5dfe04382e16.tar.gz | |
Fix:core:Fix warnings in start_real.c
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5496 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
| -rw-r--r-- | navit/config_.h | 2 | ||||
| -rw-r--r-- | navit/start_real.c | 7 | ||||
| -rw-r--r-- | navit/start_real.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/navit/config_.h b/navit/config_.h index 53562b353..64ac0465c 100644 --- a/navit/config_.h +++ b/navit/config_.h @@ -2,7 +2,7 @@ extern "C" { #endif extern int main_argc; -extern char **main_argv; +extern char * const* main_argv; extern struct config *config; extern int configured; extern int config_empty_ok; diff --git a/navit/start_real.c b/navit/start_real.c index 91099d4f5..ab5858f2c 100644 --- a/navit/start_real.c +++ b/navit/start_real.c @@ -45,6 +45,7 @@ #include "navit_nls.h" #include "atom.h" #include "command.h" +#include "geom.h" #ifdef HAVE_API_WIN32_CE #include <windows.h> #include <winbase.h> @@ -52,12 +53,12 @@ char *version=PACKAGE_VERSION" "SVN_VERSION""NAVIT_VARIANT; int main_argc; -char **main_argv; +char * const* main_argv; static void print_usage(void) { - printf(_("navit usage:\n" + printf("%s",_("navit usage:\n" "navit [options] [configfile]\n" "\t-c <file>: use <file> as config file\n" "\t-d <n>: set the global debug output level to <n> (0-3). Overrides setting from config file.\n" @@ -70,7 +71,7 @@ print_usage(void) extern void builtin_init(void); #endif /* USE_PLUGINS*/ -int main_real(int argc, const char **argv) +int main_real(int argc, char * const* argv) { xmlerror *error = NULL; char *config_file = NULL, *command=NULL, *startup_file=NULL; diff --git a/navit/start_real.h b/navit/start_real.h index 13df8126e..898251433 100644 --- a/navit/start_real.h +++ b/navit/start_real.h @@ -20,6 +20,6 @@ #ifndef NAVIT_MAIN_REAL_H #define NAVIT_MAIN_REAL_H -int main_real(int argc, const char **argv); +int main_real(int argc, char * const* argv); #endif |