diff options
| author | Vinson Lee <[email protected]> | 2012-11-14 22:25:05 -0800 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2012-11-16 23:18:23 -0800 |
| commit | acc1e59013f07e15275943dd95ad96fa2698a95a (patch) | |
| tree | a4ad92d21ca97bd9548137fdef6a580dafa95a25 /src/gallium/auxiliary/util | |
| parent | b36b6fdb32f58757175d2e727e7a98a63b0e2b76 (diff) | |
util: Only use open coded snprintf for MSVC.
MinGW has snprintf.
The patch fixes these warnings with the MinGW SCons build.
src/gallium/auxiliary/util/u_snprintf.c:459:1: warning: no previous prototype for ‘util_vsnprintf’ [-Wmissing-prototypes]
src/gallium/auxiliary/util/u_snprintf.c:1436:1: warning: no previous prototype for ‘util_snprintf’ [-Wmissing-prototypes]
Signed-off-by: Vinson Lee <[email protected]>
Tested-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/util')
| -rw-r--r-- | src/gallium/auxiliary/util/u_snprintf.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_string.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_snprintf.c b/src/gallium/auxiliary/util/u_snprintf.c index e16f103e3f5..a24b6ff38db 100644 --- a/src/gallium/auxiliary/util/u_snprintf.c +++ b/src/gallium/auxiliary/util/u_snprintf.c @@ -167,7 +167,7 @@ #if HAVE_CONFIG_H #include <config.h> #else -#ifdef _WIN32 +#ifdef _MSC_VER #define vsnprintf util_vsnprintf #define snprintf util_snprintf #define HAVE_VSNPRINTF 0 diff --git a/src/gallium/auxiliary/util/u_string.h b/src/gallium/auxiliary/util/u_string.h index 15630ad0791..fca73ffc718 100644 --- a/src/gallium/auxiliary/util/u_string.h +++ b/src/gallium/auxiliary/util/u_string.h @@ -35,7 +35,7 @@ #ifndef U_STRING_H_ #define U_STRING_H_ -#if !defined(_WIN32) && !defined(XF86_LIBC_H) +#if !defined(_MSC_VER) && !defined(XF86_LIBC_H) #include <stdio.h> #endif #include <stddef.h> @@ -64,7 +64,7 @@ util_strchrnul(const char *s, char c) #endif -#ifdef _WIN32 +#ifdef _MSC_VER int util_vsnprintf(char *, size_t, const char *, va_list); int util_snprintf(char *str, size_t size, const char *format, ...); |