From c5af4c4324ca4b8bb626bc939e3b16b9e74d9ccb Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Wed, 8 Sep 2010 04:15:36 +0200 Subject: [PATCH] Removed legacy GLFWCALL. --- tests/accuracy.c | 4 ++-- tests/events.c | 16 ++++++++-------- tests/fsaa.c | 2 +- tests/peter.c | 6 +++--- tests/reopen.c | 6 +++--- tests/tearing.c | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/accuracy.c b/tests/accuracy.c index 3811cd81..7dd73b6d 100644 --- a/tests/accuracy.c +++ b/tests/accuracy.c @@ -37,7 +37,7 @@ static int cursor_x = 0, cursor_y = 0; static int window_width = 640, window_height = 480; -static void GLFWCALL window_size_callback(int width, int height) +static void window_size_callback(int width, int height) { window_width = width; window_height = height; @@ -49,7 +49,7 @@ static void GLFWCALL window_size_callback(int width, int height) gluOrtho2D(0.f, window_width, 0.f, window_height); } -static void GLFWCALL mouse_position_callback(int x, int y) +static void mouse_position_callback(int x, int y) { cursor_x = x; cursor_y = y; diff --git a/tests/events.c b/tests/events.c index 0434844e..e517dcb0 100644 --- a/tests/events.c +++ b/tests/events.c @@ -162,7 +162,7 @@ static const char* get_character_string(int character) return result; } -static void GLFWCALL window_size_callback(int width, int height) +static void window_size_callback(int width, int height) { printf("%08x at %0.3f: Window size: %i %i\n", counter++, @@ -173,18 +173,18 @@ static void GLFWCALL window_size_callback(int width, int height) glViewport(0, 0, width, height); } -static int GLFWCALL window_close_callback(void) +static int window_close_callback(void) { printf("%08x at %0.3f: Window close\n", counter++, glfwGetTime()); return 1; } -static void GLFWCALL window_refresh_callback(void) +static void window_refresh_callback(void) { printf("%08x at %0.3f: Window refresh\n", counter++, glfwGetTime()); } -static void GLFWCALL mouse_button_callback(int button, int action) +static void mouse_button_callback(int button, int action) { const char* name = get_button_name(button); @@ -196,17 +196,17 @@ static void GLFWCALL mouse_button_callback(int button, int action) printf(" was %s\n", get_action_name(action)); } -static void GLFWCALL mouse_position_callback(int x, int y) +static void mouse_position_callback(int x, int y) { printf("%08x at %0.3f: Mouse position: %i %i\n", counter++, glfwGetTime(), x, y); } -static void GLFWCALL mouse_wheel_callback(int position) +static void mouse_wheel_callback(int position) { printf("%08x at %0.3f: Mouse wheel: %i\n", counter++, glfwGetTime(), position); } -static void GLFWCALL key_callback(int key, int action) +static void key_callback(int key, int action) { const char* name = get_key_name(key); @@ -250,7 +250,7 @@ static void GLFWCALL key_callback(int key, int action) } } -static void GLFWCALL char_callback(int character, int action) +static void char_callback(int character, int action) { printf("%08x at %0.3f: Character 0x%04x", counter++, glfwGetTime(), character); diff --git a/tests/fsaa.c b/tests/fsaa.c index 91c66d91..db15cf25 100644 --- a/tests/fsaa.c +++ b/tests/fsaa.c @@ -38,7 +38,7 @@ #define GL_MULTISAMPLE_ARB 0x809D #endif -static void GLFWCALL window_size_callback(int width, int height) +static void window_size_callback(int width, int height) { glViewport(0, 0, width, height); } diff --git a/tests/peter.c b/tests/peter.c index 4d516614..c30cf5d2 100644 --- a/tests/peter.c +++ b/tests/peter.c @@ -49,12 +49,12 @@ static void toggle_mouse_cursor(void) cursor_enabled = !cursor_enabled; } -static void GLFWCALL mouse_position_callback(int x, int y) +static void mouse_position_callback(int x, int y) { printf("Mouse moved to: %i %i\n", x, y); } -static void GLFWCALL key_callback(int key, int action) +static void key_callback(int key, int action) { switch (key) { @@ -79,7 +79,7 @@ static void GLFWCALL key_callback(int key, int action) } } -static void GLFWCALL window_size_callback(int width, int height) +static void window_size_callback(int width, int height) { glViewport(0, 0, width, height); } diff --git a/tests/reopen.c b/tests/reopen.c index bfdda374..930c1153 100644 --- a/tests/reopen.c +++ b/tests/reopen.c @@ -53,19 +53,19 @@ static const char* get_mode_name(int mode) } } -static void GLFWCALL window_size_callback(int width, int height) +static void window_size_callback(int width, int height) { glViewport(0, 0, width, height); } -static int GLFWCALL window_close_callback(void) +static int window_close_callback(void) { printf("Close callback triggered\n"); closed = GL_TRUE; return 0; } -static void GLFWCALL key_callback(int key, int action) +static void key_callback(int key, int action) { if (action != GLFW_PRESS) return; diff --git a/tests/tearing.c b/tests/tearing.c index 8e9f06a1..d9cf4a60 100644 --- a/tests/tearing.c +++ b/tests/tearing.c @@ -34,7 +34,7 @@ #include #include -static void GLFWCALL window_size_callback(int width, int height) +static void window_size_callback(int width, int height) { glViewport(0, 0, width, height); }