From 73f1e33d34b2044f2252a73e0fdd827d39724505 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 13 Apr 2018 09:32:31 -0600 Subject: mesa: remove snprintf macro in imports.h to fix MSVC build snprintf is a macro in the MSVC stdio.h header and we needed to include that header before imports.h where we also defined an snprintf macro. Otherwise, the MSVC build would fail. The recent mtypes.h removal patches seems to have exposed this issue. This patch simply removes our snprintf macro and replaces one use of it in teximage.c with _mesa_snprintf(). There are other calls to snprintf() in DRI drivers, but none of them are built on Windows. Reviewed-by: Charmaine Lee Reviewed-by: Neha Bhende --- src/mesa/main/imports.h | 4 ---- src/mesa/main/teximage.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index 72ce8783ddb..a761f01851a 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -339,10 +339,6 @@ extern int _mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list arg); -#if defined(_MSC_VER) && !defined(snprintf) -#define snprintf _snprintf -#endif - #if defined(_WIN32) && !defined(strtok_r) #define strtok_r strtok_s #endif diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 8d5f8aa5457..5284e60b202 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1911,7 +1911,7 @@ texture_error_check( struct gl_context *ctx, * requires GL_OES_texture_float) are filtered elsewhere. */ char bufCallerName[20]; - snprintf(bufCallerName, 20, "glTexImage%dD", dimensions); + _mesa_snprintf(bufCallerName, 20, "glTexImage%dD", dimensions); if (_mesa_is_gles(ctx) && texture_format_error_check_gles(ctx, format, type, internalFormat, bufCallerName)) { -- cgit v1.2.3