diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
| commit | ccc8a492607df715b08d27c6bb3b9d13b1ff48a2 (patch) | |
| tree | 4311d252acd49786ceed60cb55343af0a9294a2f /mesalib/src/gallium/auxiliary/util/u_string.h | |
| parent | a4d007b9b60f2fc7c8de46533e2f47ecb24f3c9c (diff) | |
| parent | aa10a08696cae93799fcddae3f0245ceee905e01 (diff) | |
| download | vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.gz vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.bz2 vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_string.h')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_string.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_string.h b/mesalib/src/gallium/auxiliary/util/u_string.h index ed15981f1..15630ad07 100644 --- a/mesalib/src/gallium/auxiliary/util/u_string.h +++ b/mesalib/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(_WIN32) && !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 _WIN32 int util_vsnprintf(char *, size_t, const char *, va_list); int util_snprintf(char *str, size_t size, const char *format, ...); |