From 06d077d00d4d30b05f119637fbf9b95cdfc0d4b4 Mon Sep 17 00:00:00 2001 From: Dries Harnie Date: Sun, 28 Sep 2014 12:14:38 +0200 Subject: [PATCH] TINYGL: Rename glColor3fv to tglColor3fv Linking TinyGL and OpenGL into the same binary could cause conflicts because both have a glColor3fv function. It is currently not used in ResidualVM, so it is safe to change this. --- graphics/tinygl/api.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/tinygl/api.cpp b/graphics/tinygl/api.cpp index 243ef2e30da..c4c2ec7b511 100644 --- a/graphics/tinygl/api.cpp +++ b/graphics/tinygl/api.cpp @@ -109,7 +109,7 @@ void tglColor3f(float x, float y, float z) { tglColor4f(x, y, z, 1); } -void glColor3fv(float *v) { +void tglColor3fv(float *v) { tglColor4f(v[0], v[1], v[2], 1); }