From ff67e06844415f815d6a6b1a0bdbc91c48fec1c7 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sun, 7 Jun 2015 19:32:24 +0200 Subject: [PATCH] Added prefixes to header guard macros. --- src/cocoa_platform.h | 6 +++--- src/egl_context.h | 6 +++--- src/glx_context.h | 6 +++--- src/internal.h | 6 +++--- src/iokit_joystick.h | 6 +++--- src/linux_joystick.h | 6 +++--- src/mir_platform.h | 6 +++--- src/nsgl_context.h | 6 +++--- src/posix_time.h | 6 +++--- src/posix_tls.h | 6 +++--- src/wgl_context.h | 6 +++--- src/win32_platform.h | 6 +++--- src/win32_tls.h | 6 +++--- src/winmm_joystick.h | 6 +++--- src/wl_platform.h | 6 +++--- src/x11_platform.h | 6 +++--- src/xkb_unicode.h | 6 +++--- 17 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h index dac1cb38..59982b53 100644 --- a/src/cocoa_platform.h +++ b/src/cocoa_platform.h @@ -24,8 +24,8 @@ // //======================================================================== -#ifndef _cocoa_platform_h_ -#define _cocoa_platform_h_ +#ifndef _glfw3_cocoa_platform_h_ +#define _glfw3_cocoa_platform_h_ #include @@ -118,4 +118,4 @@ void _glfwInitTimer(void); GLboolean _glfwSetVideoMode(_GLFWmonitor* monitor, const GLFWvidmode* desired); void _glfwRestoreVideoMode(_GLFWmonitor* monitor); -#endif // _cocoa_platform_h_ +#endif // _glfw3_cocoa_platform_h_ diff --git a/src/egl_context.h b/src/egl_context.h index 0b7ee289..c828690e 100644 --- a/src/egl_context.h +++ b/src/egl_context.h @@ -25,8 +25,8 @@ // //======================================================================== -#ifndef _egl_context_h_ -#define _egl_context_h_ +#ifndef _glfw3_egl_context_h_ +#define _glfw3_egl_context_h_ #include @@ -77,4 +77,4 @@ int _glfwAnalyzeContext(const _GLFWwindow* window, const _GLFWctxconfig* ctxconfig, const _GLFWfbconfig* fbconfig); -#endif // _egl_context_h_ +#endif // _glfw3_egl_context_h_ diff --git a/src/glx_context.h b/src/glx_context.h index 0c5cd101..13d6144f 100644 --- a/src/glx_context.h +++ b/src/glx_context.h @@ -25,8 +25,8 @@ // //======================================================================== -#ifndef _glx_context_h_ -#define _glx_context_h_ +#ifndef _glfw3_glx_context_h_ +#define _glfw3_glx_context_h_ #define GLX_GLXEXT_LEGACY #include @@ -97,4 +97,4 @@ int _glfwCreateContext(_GLFWwindow* window, const _GLFWfbconfig* fbconfig); void _glfwDestroyContext(_GLFWwindow* window); -#endif // _glx_context_h_ +#endif // _glfw3_glx_context_h_ diff --git a/src/internal.h b/src/internal.h index 149a96c6..c2fac3c5 100644 --- a/src/internal.h +++ b/src/internal.h @@ -25,8 +25,8 @@ // //======================================================================== -#ifndef _internal_h_ -#define _internal_h_ +#ifndef _glfw3_internal_h_ +#define _glfw3_internal_h_ #if defined(_GLFW_USE_CONFIG_H) @@ -868,4 +868,4 @@ void _glfwFreeMonitor(_GLFWmonitor* monitor); */ void _glfwFreeMonitors(_GLFWmonitor** monitors, int count); -#endif // _internal_h_ +#endif // _glfw3_internal_h_ diff --git a/src/iokit_joystick.h b/src/iokit_joystick.h index c08809f2..5987f48d 100644 --- a/src/iokit_joystick.h +++ b/src/iokit_joystick.h @@ -24,8 +24,8 @@ // //======================================================================== -#ifndef _iokit_joystick_h_ -#define _iokit_joystick_h_ +#ifndef _glfw3_iokit_joystick_h_ +#define _glfw3_iokit_joystick_h_ #include #include @@ -58,4 +58,4 @@ typedef struct _GLFWjoystickIOKit void _glfwInitJoysticks(void); void _glfwTerminateJoysticks(void); -#endif // _iokit_joystick_h_ +#endif // _glfw3_iokit_joystick_h_ diff --git a/src/linux_joystick.h b/src/linux_joystick.h index 163b07c5..dca2a2da 100644 --- a/src/linux_joystick.h +++ b/src/linux_joystick.h @@ -24,8 +24,8 @@ // //======================================================================== -#ifndef _linux_joystick_h_ -#define _linux_joystick_h_ +#ifndef _glfw3_linux_joystick_h_ +#define _glfw3_linux_joystick_h_ #include @@ -60,4 +60,4 @@ typedef struct _GLFWjoystickLinux int _glfwInitJoysticks(void); void _glfwTerminateJoysticks(void); -#endif // _linux_joystick_h_ +#endif // _glfw3_linux_joystick_h_ diff --git a/src/mir_platform.h b/src/mir_platform.h index 2d8c7778..34ef3ef2 100644 --- a/src/mir_platform.h +++ b/src/mir_platform.h @@ -24,8 +24,8 @@ // //======================================================================== -#ifndef _mir_platform_h_ -#define _mir_platform_h_ +#ifndef _glfw3_mir_platform_h_ +#define _glfw3_mir_platform_h_ #include #include @@ -108,4 +108,4 @@ typedef struct _GLFWcursorMir extern void _glfwInitEventQueue(EventQueue* queue); extern void _glfwDeleteEventQueue(EventQueue* queue); -#endif // _mir_platform_h_ +#endif // _glfw3_mir_platform_h_ diff --git a/src/nsgl_context.h b/src/nsgl_context.h index fd045359..2707bafb 100644 --- a/src/nsgl_context.h +++ b/src/nsgl_context.h @@ -24,8 +24,8 @@ // //======================================================================== -#ifndef _nsgl_context_h_ -#define _nsgl_context_h_ +#ifndef _glfw3_nsgl_context_h_ +#define _glfw3_nsgl_context_h_ #define _GLFW_PLATFORM_FBCONFIG #define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextNSGL nsgl @@ -59,4 +59,4 @@ int _glfwCreateContext(_GLFWwindow* window, const _GLFWfbconfig* fbconfig); void _glfwDestroyContext(_GLFWwindow* window); -#endif // _nsgl_context_h_ +#endif // _glfw3_nsgl_context_h_ diff --git a/src/posix_time.h b/src/posix_time.h index 3e0955a1..8e9c1dfd 100644 --- a/src/posix_time.h +++ b/src/posix_time.h @@ -25,8 +25,8 @@ // //======================================================================== -#ifndef _posix_time_h_ -#define _posix_time_h_ +#ifndef _glfw3_posix_time_h_ +#define _glfw3_posix_time_h_ #define _GLFW_PLATFORM_LIBRARY_TIME_STATE _GLFWtimePOSIX posix_time @@ -46,4 +46,4 @@ typedef struct _GLFWtimePOSIX void _glfwInitTimer(void); -#endif // _posix_time_h_ +#endif // _glfw3_posix_time_h_ diff --git a/src/posix_tls.h b/src/posix_tls.h index f3f80704..c4ff9e33 100644 --- a/src/posix_tls.h +++ b/src/posix_tls.h @@ -25,8 +25,8 @@ // //======================================================================== -#ifndef _posix_tls_h_ -#define _posix_tls_h_ +#ifndef _glfw3_posix_tls_h_ +#define _glfw3_posix_tls_h_ #include @@ -46,4 +46,4 @@ int _glfwCreateContextTLS(void); void _glfwDestroyContextTLS(void); void _glfwSetContextTLS(_GLFWwindow* context); -#endif // _posix_tls_h_ +#endif // _glfw3_posix_tls_h_ diff --git a/src/wgl_context.h b/src/wgl_context.h index 59542203..93536fdf 100644 --- a/src/wgl_context.h +++ b/src/wgl_context.h @@ -25,8 +25,8 @@ // //======================================================================== -#ifndef _wgl_context_h_ -#define _wgl_context_h_ +#ifndef _glfw3_wgl_context_h_ +#define _glfw3_wgl_context_h_ // This path may need to be changed if you build GLFW using your own setup // We ship and use our own copy of wglext.h since GLFW uses fairly new @@ -87,4 +87,4 @@ int _glfwAnalyzeContext(const _GLFWwindow* window, const _GLFWctxconfig* ctxconfig, const _GLFWfbconfig* fbconfig); -#endif // _wgl_context_h_ +#endif // _glfw3_wgl_context_h_ diff --git a/src/win32_platform.h b/src/win32_platform.h index fa86bf1d..6313a918 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -25,8 +25,8 @@ // //======================================================================== -#ifndef _win32_platform_h_ -#define _win32_platform_h_ +#ifndef _glfw3_win32_platform_h_ +#define _glfw3_win32_platform_h_ // We don't need all the fancy stuff #ifndef NOMINMAX @@ -243,4 +243,4 @@ void _glfwInitTimer(void); GLboolean _glfwSetVideoMode(_GLFWmonitor* monitor, const GLFWvidmode* desired); void _glfwRestoreVideoMode(_GLFWmonitor* monitor); -#endif // _win32_platform_h_ +#endif // _glfw3_win32_platform_h_ diff --git a/src/win32_tls.h b/src/win32_tls.h index cb79cb41..fcc0be23 100644 --- a/src/win32_tls.h +++ b/src/win32_tls.h @@ -25,8 +25,8 @@ // //======================================================================== -#ifndef _win32_tls_h_ -#define _win32_tls_h_ +#ifndef _glfw3_win32_tls_h_ +#define _glfw3_win32_tls_h_ #define _GLFW_PLATFORM_LIBRARY_TLS_STATE _GLFWtlsWin32 win32_tls @@ -45,4 +45,4 @@ int _glfwCreateContextTLS(void); void _glfwDestroyContextTLS(void); void _glfwSetContextTLS(_GLFWwindow* context); -#endif // _win32_tls_h_ +#endif // _glfw3_win32_tls_h_ diff --git a/src/winmm_joystick.h b/src/winmm_joystick.h index 608f1dc5..74ea3ef8 100644 --- a/src/winmm_joystick.h +++ b/src/winmm_joystick.h @@ -24,8 +24,8 @@ // //======================================================================== -#ifndef _winmm_joystick_h_ -#define _winmm_joystick_h_ +#ifndef _glfw3_winmm_joystick_h_ +#define _glfw3_winmm_joystick_h_ #define _GLFW_PLATFORM_LIBRARY_JOYSTICK_STATE \ _GLFWjoystickWinMM winmm_js[GLFW_JOYSTICK_LAST + 1] @@ -44,4 +44,4 @@ typedef struct _GLFWjoystickWinMM void _glfwInitJoysticks(void); void _glfwTerminateJoysticks(void); -#endif // _winmm_joystick_h_ +#endif // _glfw3_winmm_joystick_h_ diff --git a/src/wl_platform.h b/src/wl_platform.h index a500c924..dfc29c30 100644 --- a/src/wl_platform.h +++ b/src/wl_platform.h @@ -24,8 +24,8 @@ // //======================================================================== -#ifndef _wayland_platform_h_ -#define _wayland_platform_h_ +#ifndef _glfw3_wayland_platform_h_ +#define _glfw3_wayland_platform_h_ #include #include @@ -138,4 +138,4 @@ typedef struct _GLFWcursorWayland void _glfwAddOutput(uint32_t name, uint32_t version); -#endif // _wayland_platform_h_ +#endif // _glfw3_wayland_platform_h_ diff --git a/src/x11_platform.h b/src/x11_platform.h index 38be31e9..b17478f8 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -25,8 +25,8 @@ // //======================================================================== -#ifndef _x11_platform_h_ -#define _x11_platform_h_ +#ifndef _glfw3_x11_platform_h_ +#define _glfw3_x11_platform_h_ #include #include @@ -263,4 +263,4 @@ void _glfwGrabXErrorHandler(void); void _glfwReleaseXErrorHandler(void); void _glfwInputXError(int error, const char* message); -#endif // _x11_platform_h_ +#endif // _glfw3_x11_platform_h_ diff --git a/src/xkb_unicode.h b/src/xkb_unicode.h index 9772901d..a9eb8e99 100644 --- a/src/xkb_unicode.h +++ b/src/xkb_unicode.h @@ -24,10 +24,10 @@ // //======================================================================== -#ifndef _xkb_unicode_h_ -#define _xkb_unicode_h_ +#ifndef _glfw3_xkb_unicode_h_ +#define _glfw3_xkb_unicode_h_ long _glfwKeySym2Unicode(unsigned int keysym); -#endif // _xkb_unicode_h_ +#endif // _glfw3_xkb_unicode_h_