Module: Demos Branch: master Commit: 414492b502fa131c8f4e1a141dee28478d6e53c4 URL: http://cgit.freedesktop.org/mesa/demos/commit/?id=414492b502fa131c8f4e1a141dee28478d6e53c4
Author: Brian Paul <[email protected]> Date: Fri Aug 31 13:58:31 2012 -0600 fp-tri: s/Display/Draw/ to avoid collision with X Display --- src/fp/fp-tri.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fp/fp-tri.c b/src/fp/fp-tri.c index f946dfa..d063b85 100644 --- a/src/fp/fp-tri.c +++ b/src/fp/fp-tri.c @@ -215,7 +215,7 @@ static void Key(unsigned char key, int x, int y) glutPostRedisplay(); } -static void Display(void) +static void Draw(void) { glClear(GL_COLOR_BUFFER_BIT); @@ -255,7 +255,7 @@ int main(int argc, char **argv) glewInit(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); - glutDisplayFunc(Display); + glutDisplayFunc(Draw); Init(); #ifndef WIN32 if (show_fps) { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
