From aceae09ef05dbe8540d8a2da6f784153deb9bbf6 Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Mon, 23 Jan 2017 20:21:00 +0100 Subject: [PATCH] glsl: fix compile errors with mingw due to missing PRIx64 definitions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit define __STDC_FORMAT_MACROS and include (same as ir_builder_print_visitor.cpp already does). Otherwise, some mingw build errors out (since 8e7e1ae0365ddc7edb0d4d98250ab46728e6c14a and bbce1c538dc0cb8bf3769510283d11847dc07540 presumably) with: src/compiler/glsl/ir_print_visitor.cpp:479:40: error: expected ‘)’ before ‘PRIu64’ case GLSL_TYPE_UINT64:fprintf(f, "%" PRIu64, ir->value.u64[i]); break; (Note even with that fix I get other format specifier warnings: src/compiler/glsl/ir_print_visitor.cpp:473:47: warning: unknown conversion type character ‘a’ in format [-Wformat=] fprintf(f, "%a", ir->value.f[i]); ^ src/compiler/glsl/ir_print_visitor.cpp:473:47: warning: too many arguments for format [-Wformat-extra-args] but it still compiles at least) Reviewed-by: Jose Fonseca --- src/compiler/glsl/glsl_parser_extras.cpp | 2 ++ src/compiler/glsl/ir_print_visitor.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index e888090f209..3d2fc1429b4 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -20,6 +20,8 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ +#define __STDC_FORMAT_MACROS 1 +#include /* for PRIx64 macro */ #include #include #include diff --git a/src/compiler/glsl/ir_print_visitor.cpp b/src/compiler/glsl/ir_print_visitor.cpp index 0763277737e..debbdadebcc 100644 --- a/src/compiler/glsl/ir_print_visitor.cpp +++ b/src/compiler/glsl/ir_print_visitor.cpp @@ -21,6 +21,8 @@ * DEALINGS IN THE SOFTWARE. */ +#define __STDC_FORMAT_MACROS 1 +#include /* for PRIx64 macro */ #include "ir_print_visitor.h" #include "compiler/glsl_types.h" #include "glsl_parser_extras.h" -- 2.30.2