diff options
| author | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-10-07 20:45:08 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-10-07 20:45:08 +0200 |
| commit | 7ca7220ea1d31dbdbf1fe7e6f3e6cc4ff8b0abde (patch) | |
| tree | a4e50f36da7c75c945a2418738e2a84af2b3789d /progs/perf/common.c | |
| parent | 57abb76e1095d14f54ea8b8d0d2220e209b8656f (diff) | |
| parent | 5b4c0b864a25fa193e7ba828cf5ce483ca05bd4e (diff) | |
Merge branch 'master' into r300g-glsl
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
Diffstat (limited to 'progs/perf/common.c')
| -rw-r--r-- | progs/perf/common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/progs/perf/common.c b/progs/perf/common.c index 722f4b7b45..b6489ef918 100644 --- a/progs/perf/common.c +++ b/progs/perf/common.c @@ -30,6 +30,10 @@ #include <stdlib.h> #include <stdarg.h> +#if defined(_MSC_VER) +#define snprintf _snprintf +#endif + /* Need to add a fflush windows console with mingw, otherwise nothing * shows up until program exit. May want to add logging here. |