diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-10-29 11:51:05 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-10-29 11:51:05 +0000 |
| commit | 347c03922199f8cd95d3a90f2c1d288fbf6e6871 (patch) | |
| tree | 2550cc4484267c5225773510c58345d58a82bec5 /navit/support | |
| parent | c0b5ad89910f7eeabe10649b022cab7b3acaffb7 (diff) | |
| download | navit-347c03922199f8cd95d3a90f2c1d288fbf6e6871.tar.gz | |
Fix:Core:Various fixes for compiling with mingw
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@1611 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/support')
| -rw-r--r-- | navit/support/ezxml/ezxml.c | 2 | ||||
| -rw-r--r-- | navit/support/glib/gmessages.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/navit/support/ezxml/ezxml.c b/navit/support/ezxml/ezxml.c index 82b11fb99..7095c7757 100644 --- a/navit/support/ezxml/ezxml.c +++ b/navit/support/ezxml/ezxml.c @@ -630,7 +630,7 @@ ezxml_t ezxml_parse_fd(int fd) size_t l; void *m; - if (fd < 0) return NULL; + if (fd == -1) return NULL; fstat(fd, &st); #ifndef EZXML_NOMMAP diff --git a/navit/support/glib/gmessages.c b/navit/support/glib/gmessages.c index 6790c7595..25a0769bc 100644 --- a/navit/support/glib/gmessages.c +++ b/navit/support/glib/gmessages.c @@ -48,6 +48,7 @@ #include "gprintfint.h" #include "gthreadprivate.h" #include "galias.h" +#include "config.h" #if NOT_NEEDED_FOR_NAVIT #ifdef G_OS_WIN32 @@ -1061,8 +1062,13 @@ gsize g_printf_string_upper_bound (const gchar *format, va_list args) { +#ifdef HAVE_API_WIN32_CE + gchar c[16384]; + return _g_vsnprintf (c, 16384, format, args) + 1; +#else gchar c; return _g_vsnprintf (&c, 1, format, args) + 1; +#endif } #if NOT_NEEDED_FOR_NAVIT |