From f10bff9bc04a82562e8ea5842effe411a8b3f884 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 21 Jan 2014 21:32:20 -0800 Subject: [PATCH] Avoid polluting the compiler's namespace with our own stuff. We can't completely avoid it, since gl's headers use these defines for their header guards, and we really do need to stop the system GL headers from doing anything. Fixes #14 --- include/epoxy/egl.h | 6 +++--- include/epoxy/gl.h | 6 +++--- include/epoxy/glx.h | 6 +++--- include/epoxy/wgl.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/epoxy/egl.h b/include/epoxy/egl.h index 7b30a04..5771ccd 100644 --- a/include/epoxy/egl.h +++ b/include/epoxy/egl.h @@ -27,8 +27,8 @@ * function pointers */ -#ifndef __EPOXY_EGL_H -#define __EPOXY_EGL_H +#ifndef EPOXY_EGL_H +#define EPOXY_EGL_H #ifdef __cplusplus extern "C" { @@ -52,4 +52,4 @@ int epoxy_egl_version(EGLDisplay *dpy); } /* extern "C" */ #endif -#endif /* __EPOXY_EGL_H */ +#endif /* EPOXY_EGL_H */ diff --git a/include/epoxy/gl.h b/include/epoxy/gl.h index 023810c..d389076 100644 --- a/include/epoxy/gl.h +++ b/include/epoxy/gl.h @@ -27,8 +27,8 @@ * global function pointers or a hidden vtable. */ -#ifndef __EPOXY_GL_H -#define __EPOXY_GL_H +#ifndef EPOXY_GL_H +#define EPOXY_GL_H #ifdef __cplusplus extern "C" { @@ -85,4 +85,4 @@ int epoxy_gl_version(void); } /* extern "C" */ #endif -#endif /* __EPOXY_GL_H */ +#endif /* EPOXY_GL_H */ diff --git a/include/epoxy/glx.h b/include/epoxy/glx.h index 9dc2d8f..36fc617 100644 --- a/include/epoxy/glx.h +++ b/include/epoxy/glx.h @@ -27,8 +27,8 @@ * function pointers. */ -#ifndef __EPOXY_GLX_H -#define __EPOXY_GLX_H +#ifndef EPOXY_GLX_H +#define EPOXY_GLX_H #ifdef __cplusplus extern "C" { @@ -55,4 +55,4 @@ int epoxy_glx_version(Display *dpy, int screen); } /* extern "C" */ #endif -#endif /* __EPOXY_GLX_H */ +#endif /* EPOXY_GLX_H */ diff --git a/include/epoxy/wgl.h b/include/epoxy/wgl.h index 8d0af5a..026d052 100644 --- a/include/epoxy/wgl.h +++ b/include/epoxy/wgl.h @@ -27,8 +27,8 @@ * vtable. */ -#ifndef __EPOXY_WGL_H -#define __EPOXY_WGL_H +#ifndef EPOXY_WGL_H +#define EPOXY_WGL_H #ifdef __cplusplus extern "C" { @@ -55,4 +55,4 @@ void epoxy_handle_external_wglMakeCurrent(void); } /* extern "C" */ #endif -#endif /* __EPOXY_WGL_H */ +#endif /* EPOXY_WGL_H */