diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-24 15:58:19 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-24 15:58:19 +0000 |
| commit | 0e648db576e7d4f3b3747bab9fccf595213100e2 (patch) | |
| tree | 0b5d40b513bd1f66c63fd14d42a40983df3ad0fd /navit/util.c | |
| parent | eead77d7b00fd8919f1cb9297ea2074c289336d5 (diff) | |
| download | navit-0e648db576e7d4f3b3747bab9fccf595213100e2.tar.gz | |
Fix:Core:MSVC fixes|Thanks chollya
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3972 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/util.c')
| -rw-r--r-- | navit/util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/navit/util.c b/navit/util.c index 87bb515fa..4381f81d2 100644 --- a/navit/util.c +++ b/navit/util.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <stdarg.h> #include <time.h> +#include <limits.h> #include "util.h" void @@ -207,11 +208,9 @@ getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp) /* Make enough space for len+1 (for final NUL) bytes. */ if (cur_len + 1 >= *n) { - size_t needed_max = - SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX; + size_t needed_max=SIZE_MAX; size_t needed = 2 * *n + 1; /* Be generous. */ char *new_lineptr; - if (needed_max < needed) needed = needed_max; if (cur_len + 1 >= needed) |