diff options
| -rw-r--r-- | src/glsl/glsl_types.cpp | 1 | ||||
| -rw-r--r-- | src/glsl/ir_explog_to_explog2.cpp | 2 | ||||
| -rw-r--r-- | 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 8e80cf99e9..518abc959d 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 4fe1daaee9..9bf8271081 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 22ac26e15e..6c2ef52d35 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 |