From 64c677be9e9e8e9ab693000b99ca61ae710ef0c5 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Wed, 12 Sep 2012 03:17:50 +0200 Subject: [PATCH] Renamed config macro to match convention. --- CMakeLists.txt | 2 +- src/config.h.in | 2 +- src/x11_init.c | 2 +- src/x11_joystick.c | 20 ++++++++++---------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c72e00ae..a1ad4923 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,7 +184,7 @@ if (_GLFW_X11_GLX) endif() if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(_GLFW_USE_LINUX_JOYSTICKS 1) + set(_GLFW_HAS_LINUX_JOYSTICKS 1) endif() endif() diff --git a/src/config.h.in b/src/config.h.in index 01d541a2..a432d947 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -64,7 +64,7 @@ #cmakedefine _GLFW_HAS_GLXGETPROCADDRESSEXT // Define this to 1 if the Linux joystick API is available -#cmakedefine _GLFW_USE_LINUX_JOYSTICKS +#cmakedefine _GLFW_HAS_LINUX_JOYSTICKS // The GLFW version as used by glfwGetVersionString #define _GLFW_VERSION_FULL "@GLFW_VERSION_FULL@" diff --git a/src/x11_init.c b/src/x11_init.c index 32719cbf..666866de 100644 --- a/src/x11_init.c +++ b/src/x11_init.c @@ -719,7 +719,7 @@ const char* _glfwPlatformGetVersionString(void) #if defined(_POSIX_TIMERS) && defined(_POSIX_MONOTONIC_CLOCK) " clock_gettime" #endif -#if defined(_GLFW_USE_LINUX_JOYSTICKS) +#if defined(_GLFW_HAS_LINUX_JOYSTICKS) " Linux-joystick-API" #else " no-joystick-support" diff --git a/src/x11_joystick.c b/src/x11_joystick.c index c1fb62be..3d2f597d 100644 --- a/src/x11_joystick.c +++ b/src/x11_joystick.c @@ -30,7 +30,7 @@ #include "internal.h" -#ifdef _GLFW_USE_LINUX_JOYSTICKS +#ifdef _GLFW_HAS_LINUX_JOYSTICKS #include #include @@ -41,7 +41,7 @@ #include #include #include -#endif // _GLFW_USE_LINUX_JOYSTICKS +#endif // _GLFW_HAS_LINUX_JOYSTICKS //======================================================================== @@ -50,7 +50,7 @@ static int openJoystickDevice(int joy, const char* path) { -#ifdef _GLFW_USE_LINUX_JOYSTICKS +#ifdef _GLFW_HAS_LINUX_JOYSTICKS char numAxes, numButtons; int fd, version; @@ -97,7 +97,7 @@ static int openJoystickDevice(int joy, const char* path) } _glfwLibrary.X11.joystick[joy].present = GL_TRUE; -#endif // _GLFW_USE_LINUX_JOYSTICKS +#endif // _GLFW_HAS_LINUX_JOYSTICKS return GL_TRUE; } @@ -109,7 +109,7 @@ static int openJoystickDevice(int joy, const char* path) static void pollJoystickEvents(void) { -#ifdef _GLFW_USE_LINUX_JOYSTICKS +#ifdef _GLFW_HAS_LINUX_JOYSTICKS int i; ssize_t result; struct js_event e; @@ -160,7 +160,7 @@ static void pollJoystickEvents(void) } } } -#endif // _GLFW_USE_LINUX_JOYSTICKS +#endif // _GLFW_HAS_LINUX_JOYSTICKS } @@ -174,7 +174,7 @@ static void pollJoystickEvents(void) int _glfwInitJoysticks(void) { -#ifdef _GLFW_USE_LINUX_JOYSTICKS +#ifdef _GLFW_HAS_LINUX_JOYSTICKS int i, joy = 0; regex_t regex; DIR* dir; @@ -215,7 +215,7 @@ int _glfwInitJoysticks(void) } regfree(®ex); -#endif // _GLFW_USE_LINUX_JOYSTICKS +#endif // _GLFW_HAS_LINUX_JOYSTICKS return GL_TRUE; } @@ -227,7 +227,7 @@ int _glfwInitJoysticks(void) void _glfwTerminateJoysticks(void) { -#ifdef _GLFW_USE_LINUX_JOYSTICKS +#ifdef _GLFW_HAS_LINUX_JOYSTICKS int i; for (i = 0; i <= GLFW_JOYSTICK_LAST; i++) @@ -241,7 +241,7 @@ void _glfwTerminateJoysticks(void) _glfwLibrary.X11.joystick[i].present = GL_FALSE; } } -#endif // _GLFW_USE_LINUX_JOYSTICKS +#endif // _GLFW_HAS_LINUX_JOYSTICKS }