diff options
| author | Fabien Costantini <fabien@onepost.net> | 2012-04-05 05:12:30 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2012-04-05 05:12:30 +0000 |
| commit | 8809c5d65dd20895dcae90e9d2af05fd271f2e9e (patch) | |
| tree | d53cbf6d921ae68bda31b6c5d522dc8c87ee9bd1 /src/vsnprintf.c | |
| parent | 37ea8ba9e635e9655417714bd49ab7bb2b36beb5 (diff) | |
Fixed build error in msvs because Fl ref to FULLSCREEN enum was not accessible in Fl_Widget. new inline is_fullscreen() getter has been implemented to avoid a build error with (at least) msvc compilers. Fixed a ton of warnings / problems when bilding on windows 64 bits target with ms toolchain. cleaned up about 200 warnings raised when building win74 targets.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9325 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/vsnprintf.c')
| -rw-r--r-- | src/vsnprintf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vsnprintf.c b/src/vsnprintf.c index abcb9ea3c..c7e51db75 100644 --- a/src/vsnprintf.c +++ b/src/vsnprintf.c @@ -129,7 +129,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { sprintf(temp, tformat, va_arg(ap, double)); - bytes += strlen(temp); + bytes += (int) strlen(temp); if (bufptr) { if ((bufptr + strlen(temp)) > bufend) { @@ -162,7 +162,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { else sprintf(temp, tformat, va_arg(ap, int)); - bytes += strlen(temp); + bytes += (int) strlen(temp); if (bufptr) { if ((bufptr + strlen(temp)) > bufend) { @@ -180,7 +180,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { sprintf(temp, tformat, va_arg(ap, void *)); - bytes += strlen(temp); + bytes += (int) strlen(temp); if (bufptr) { if ((bufptr + strlen(temp)) > bufend) { @@ -199,7 +199,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { if (bufptr) { if (width <= 1) *bufptr++ = va_arg(ap, int); else { - if ((bufptr + width) > bufend) width = bufend - bufptr; + if ((bufptr + width) > bufend) width = (int) (bufend - bufptr); memcpy(bufptr, va_arg(ap, char *), (size_t)width); bufptr += width; @@ -210,13 +210,13 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { case 's' : /* String */ if ((s = va_arg(ap, char *)) == NULL) s = "(null)"; - slen = strlen(s); + slen = (int) strlen(s); if (slen > width && prec != width) width = slen; bytes += width; if (bufptr) { - if ((bufptr + width) > bufend) width = bufend - bufptr; + if ((bufptr + width) > bufend) width = (int) (bufend - bufptr); if (slen > width) slen = width; |