diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-04-23 18:45:28 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-04-23 18:45:28 +0000 |
| commit | 117bd3ce5ec2a143f4735403d53792a165ac14b8 (patch) | |
| tree | f6299dc9cc97ad263d60ca81c0dd05af4b591c8f /navit/support | |
| parent | 7de15581398bea00e0f593e4c182caf2e87e320c (diff) | |
| download | navit-117bd3ce5ec2a143f4735403d53792a165ac14b8.tar.gz | |
Fix:Core:Fix some warnings
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5035 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/support')
| -rw-r--r-- | navit/support/espeak/tr_languages.c | 2 | ||||
| -rw-r--r-- | navit/support/glib/gutils.c | 5 | ||||
| -rw-r--r-- | navit/support/libc/locale.h | 7 | ||||
| -rw-r--r-- | navit/support/wordexp/wordexp.c | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/navit/support/espeak/tr_languages.c b/navit/support/espeak/tr_languages.c index 2416755bf..83d1c8041 100644 --- a/navit/support/espeak/tr_languages.c +++ b/navit/support/espeak/tr_languages.c @@ -493,7 +493,7 @@ Translator *SelectTranslator(const char *name) tr->langopts.stress_flags = 0x0024; // don't use secondary stress tr->langopts.param[LOPT_IT_LENGTHEN] = 1; // remove lengthen indicator from unstressed syllables - tr->langopts.numbers = 0x1509 + 0x8000 + NUM_NOPAUSE | NUM_ROMAN | NUM_VIGESIMAL; + tr->langopts.numbers = 0x1509 + 0x8000 + (NUM_NOPAUSE | NUM_ROMAN | NUM_VIGESIMAL); SetLetterVowel(tr,'y'); } break; diff --git a/navit/support/glib/gutils.c b/navit/support/glib/gutils.c index 2871e381b..6d3fda447 100644 --- a/navit/support/glib/gutils.c +++ b/navit/support/glib/gutils.c @@ -1899,9 +1899,8 @@ static gchar *g_prgname = NULL; gchar* g_get_prgname (void) { - gchar* retval; + gchar* retval =NULL; -return 0; // G_LOCK (g_prgname); //#ifdef G_OS_WIN32 // if (g_prgname == NULL) @@ -1929,7 +1928,7 @@ return 0; // retval = g_prgname; // G_UNLOCK (g_prgname); // -// return retval; + return retval; } /** diff --git a/navit/support/libc/locale.h b/navit/support/libc/locale.h index 51d62f3a3..320c3ac2d 100644 --- a/navit/support/libc/locale.h +++ b/navit/support/libc/locale.h @@ -1,8 +1,15 @@ #ifndef _LOCALE_H #define _LOCALE_H 1 + +#ifndef SUBLANG_BENGALI_BANGLADESH #define SUBLANG_BENGALI_BANGLADESH 0x02 +#endif +#ifndef SUBLANG_PUNJABI_PAKISTAN #define SUBLANG_PUNJABI_PAKISTAN 0x02 +#endif +#ifndef SUBLANG_ROMANIAN_MOLDOVA #define SUBLANG_ROMANIAN_MOLDOVA 0x02 +#endif struct lconv { char *decimal_point; }; diff --git a/navit/support/wordexp/wordexp.c b/navit/support/wordexp/wordexp.c index d2ed3ff28..6b080d1f7 100644 --- a/navit/support/wordexp/wordexp.c +++ b/navit/support/wordexp/wordexp.c @@ -12,6 +12,7 @@ #endif /* _MSC_VER */ #include "wordexp.h" #include "glob.h" +#include <glib.h> static int |