diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-06 08:48:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:48:23 +0200 |
| commit | aa10a08696cae93799fcddae3f0245ceee905e01 (patch) | |
| tree | 950730c362229584b5e60fc1fe309325b7ba66b1 /mesalib/src/gallium/auxiliary/util | |
| parent | af1e359cc622a0c53d5632fb03ef9bd4c17de897 (diff) | |
| download | vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.tar.gz vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.tar.bz2 vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.zip | |
xserver mesa git update 6 sep 2012
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_draw_quad.c | 3 | ||||
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_format.c | 8 | ||||
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_snprintf.c | 2 | ||||
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_string.h | 4 |
4 files changed, 6 insertions, 11 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_draw_quad.c b/mesalib/src/gallium/auxiliary/util/u_draw_quad.c index 469c87498..81c4f107e 100644 --- a/mesalib/src/gallium/auxiliary/util/u_draw_quad.c +++ b/mesalib/src/gallium/auxiliary/util/u_draw_quad.c @@ -151,6 +151,5 @@ out: if (vbuf) pipe_resource_reference(&vbuf, NULL); - if (v) - FREE(v); + FREE(v); } diff --git a/mesalib/src/gallium/auxiliary/util/u_format.c b/mesalib/src/gallium/auxiliary/util/u_format.c index 6f4529835..a41c468a9 100644 --- a/mesalib/src/gallium/auxiliary/util/u_format.c +++ b/mesalib/src/gallium/auxiliary/util/u_format.c @@ -618,13 +618,9 @@ util_format_translate(enum pipe_format dst_format, src_row += src_step; } - if (tmp_s) { - FREE(tmp_s); - } + FREE(tmp_s); - if (tmp_z) { - FREE(tmp_z); - } + FREE(tmp_z); return; } diff --git a/mesalib/src/gallium/auxiliary/util/u_snprintf.c b/mesalib/src/gallium/auxiliary/util/u_snprintf.c index f0d53b3ce..e16f103e3 100644 --- a/mesalib/src/gallium/auxiliary/util/u_snprintf.c +++ b/mesalib/src/gallium/auxiliary/util/u_snprintf.c @@ -167,7 +167,7 @@ #if HAVE_CONFIG_H #include <config.h> #else -#ifdef WIN32 +#ifdef _WIN32 #define vsnprintf util_vsnprintf #define snprintf util_snprintf #define HAVE_VSNPRINTF 0 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, ...); |