-
Matt Turner authored
This is a squash of the following two commits: ralloc: Annotate printf functions with PRINTFLIKE(...) Catches problems such as (in the gles3 branch) glcpp-parse.y: In function '_glcpp_parser_handle_version_declaration': glcpp-parse.y:1990:39: warning: format '%lli' expects argument of type 'long long int', but argument 4 has type 'int' [-Wformat] As a side-effect, remove ralloc.c's likely/unlikely macros and just use the ones from main/compiler.h. NOTE: This is a candidate for the release branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 41b14d12) and src/glsl/tests/Makefile.am: Specify -I... in AM_CPPFLAGS When specifying per-target CFLAGS (e.g., ralloc_test_CFLAGS) AM_CFLAGS are not used. AM_CPPFLAGS should be used for includes anyway. Fixes a build problem since 41b14d12 : CC ralloc_test-ralloc.o In file included from ../../../src/glsl/ralloc.c:42:0: ../../../src/glsl/ralloc.h:57:27: fatal error: main/compiler.h: No such file or directory Acked-by: Paul Berry <stereotype441@gmail.com> (cherry picked from commit 67f1e7bf)
94cc306e