Module: Mesa Branch: master Commit: 6dad5a4e8d5c4ea90bb9342e329defb9c8eb2092 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6dad5a4e8d5c4ea90bb9342e329defb9c8eb2092
Author: Ian Romanick <[email protected]> Date: Thu Aug 12 17:57:07 2010 -0700 glsl2: Include imports.h to get snprintf wrapper for MSVC Signed-off-by: José Fonseca <[email protected]> --- src/glsl/glsl_types.cpp | 1 + src/glsl/ir_explog_to_explog2.cpp | 2 +- src/mesa/main/imports.h | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index 8e80cf9..518abc9 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -29,6 +29,7 @@ #include "glsl_types.h" #include "builtin_types.h" extern "C" { +#include "main/imports.h" #include "program/hash_table.h" } diff --git a/src/glsl/ir_explog_to_explog2.cpp b/src/glsl/ir_explog_to_explog2.cpp index 4fe1daa..9bf8271 100644 --- a/src/glsl/ir_explog_to_explog2.cpp +++ b/src/glsl/ir_explog_to_explog2.cpp @@ -29,7 +29,7 @@ * and log2 operations. */ -#include <math.h> +#include "main/imports.h" #include "ir.h" #include "glsl_types.h" diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index 22ac26e..6c2ef52 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -578,6 +578,12 @@ _mesa_error( __GLcontext *ctx, GLenum error, const char *fmtString, ... ); extern void _mesa_debug( const __GLcontext *ctx, const char *fmtString, ... ); + +#if defined(_MSC_VER) && !defined(snprintf) +#define snprintf _snprintf +#endif + + #ifdef __cplusplus } #endif _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
