Commit ff67e068 authored by Camilla Berglund's avatar Camilla Berglund
Browse files

Added prefixes to header guard macros.

parent 5f74c2af
......@@ -24,8 +24,8 @@
//
//========================================================================
#ifndef _cocoa_platform_h_
#define _cocoa_platform_h_
#ifndef _glfw3_cocoa_platform_h_
#define _glfw3_cocoa_platform_h_
#include <stdint.h>
......@@ -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_
......@@ -25,8 +25,8 @@
//
//========================================================================
#ifndef _egl_context_h_
#define _egl_context_h_
#ifndef _glfw3_egl_context_h_
#define _glfw3_egl_context_h_
#include <EGL/egl.h>
......@@ -77,4 +77,4 @@ int _glfwAnalyzeContext(const _GLFWwindow* window,
const _GLFWctxconfig* ctxconfig,
const _GLFWfbconfig* fbconfig);
#endif // _egl_context_h_
#endif // _glfw3_egl_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 <GL/glx.h>
......@@ -97,4 +97,4 @@ int _glfwCreateContext(_GLFWwindow* window,
const _GLFWfbconfig* fbconfig);
void _glfwDestroyContext(_GLFWwindow* window);
#endif // _glx_context_h_
#endif // _glfw3_glx_context_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_
......@@ -24,8 +24,8 @@
//
//========================================================================
#ifndef _iokit_joystick_h_
#define _iokit_joystick_h_
#ifndef _glfw3_iokit_joystick_h_
#define _glfw3_iokit_joystick_h_
#include <IOKit/IOKitLib.h>
#include <IOKit/IOCFPlugIn.h>
......@@ -58,4 +58,4 @@ typedef struct _GLFWjoystickIOKit
void _glfwInitJoysticks(void);
void _glfwTerminateJoysticks(void);
#endif // _iokit_joystick_h_
#endif // _glfw3_iokit_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 <regex.h>
......@@ -60,4 +60,4 @@ typedef struct _GLFWjoystickLinux
int _glfwInitJoysticks(void);
void _glfwTerminateJoysticks(void);
#endif // _linux_joystick_h_
#endif // _glfw3_linux_joystick_h_
......@@ -24,8 +24,8 @@
//
//========================================================================
#ifndef _mir_platform_h_
#define _mir_platform_h_
#ifndef _glfw3_mir_platform_h_
#define _glfw3_mir_platform_h_
#include <sys/queue.h>
#include <pthread.h>
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -25,8 +25,8 @@
//
//========================================================================
#ifndef _posix_tls_h_
#define _posix_tls_h_
#ifndef _glfw3_posix_tls_h_
#define _glfw3_posix_tls_h_
#include <pthread.h>
......@@ -46,4 +46,4 @@ int _glfwCreateContextTLS(void);
void _glfwDestroyContextTLS(void);
void _glfwSetContextTLS(_GLFWwindow* context);
#endif // _posix_tls_h_
#endif // _glfw3_posix_tls_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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -24,8 +24,8 @@
//
//========================================================================
#ifndef _wayland_platform_h_
#define _wayland_platform_h_
#ifndef _glfw3_wayland_platform_h_
#define _glfw3_wayland_platform_h_
#include <wayland-client.h>
#include <xkbcommon/xkbcommon.h>
......@@ -138,4 +138,4 @@ typedef struct _GLFWcursorWayland
void _glfwAddOutput(uint32_t name, uint32_t version);
#endif // _wayland_platform_h_
#endif // _glfw3_wayland_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 <unistd.h>
#include <signal.h>
......@@ -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_
......@@ -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_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment