diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-25 16:02:24 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-25 16:02:24 +0000 |
| commit | f7876e2caefa2434ee5c191225a30e1a28d7e73c (patch) | |
| tree | 16aebae60516d6795832728f02f872ea9bebe8e3 /navit/support | |
| parent | 219c447ed4399fcb21a50e8eb91155b85bdbfdd9 (diff) | |
| download | navit-svn-f7876e2caefa2434ee5c191225a30e1a28d7e73c.tar.gz | |
Fix:Core:MSVC fixes
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4027 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/support')
| -rw-r--r-- | navit/support/ezxml/ezxml.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/navit/support/ezxml/ezxml.c b/navit/support/ezxml/ezxml.c index 14754f15..216afdd9 100644 --- a/navit/support/ezxml/ezxml.c +++ b/navit/support/ezxml/ezxml.c @@ -27,9 +27,11 @@ #include <stdarg.h> #include <string.h> #include <ctype.h> -#ifndef _MSC_VER +#include <glib.h> +#include "config.h" +#ifdef HAVE_UNISTD_H #include <unistd.h> -#endif /* _MSC_VER */ +#endif #include <sys/types.h> #ifndef EZXML_NOMMAP #include <sys/mman.h> @@ -142,7 +144,7 @@ ezxml_t ezxml_err(ezxml_root_t root, char *s, const char *err, ...) char *t, fmt[EZXML_ERRL]; for (t = root->s; t < s; t++) if (*t == '\n') line++; - snprintf(fmt, EZXML_ERRL, "[error near line %d]: %s", line, err); + g_snprintf(fmt, EZXML_ERRL, "[error near line %d]: %s", line, err); va_start(ap, err); vsnprintf(root->err, EZXML_ERRL, fmt, ap); |