Add C++ guards around generated headers

Commit 0625a74d69 moved the C++ guards
after the inclusion of the generated headers, which was an unintended
behavioural change and now requires header guards around the inclusion
of Epoxy headers.

Fixes: #106
macos/v1.5.9
Emmanuele Bassi 8 years ago
parent 5564f9d28d
commit 3fb4fea674
  1. 4
      include/epoxy/egl.h
  2. 4
      include/epoxy/gl.h
  3. 4
      include/epoxy/glx.h
  4. 4
      include/epoxy/wgl.h

@ -41,10 +41,10 @@
#define __eglext_h_ #define __eglext_h_
#endif #endif
#include "epoxy/egl_generated.h"
EPOXY_BEGIN_DECLS EPOXY_BEGIN_DECLS
#include "epoxy/egl_generated.h"
EPOXY_PUBLIC bool epoxy_has_egl_extension(EGLDisplay dpy, const char *extension); EPOXY_PUBLIC bool epoxy_has_egl_extension(EGLDisplay dpy, const char *extension);
EPOXY_PUBLIC int epoxy_egl_version(EGLDisplay dpy); EPOXY_PUBLIC int epoxy_egl_version(EGLDisplay dpy);
EPOXY_PUBLIC bool epoxy_has_egl(void); EPOXY_PUBLIC bool epoxy_has_egl(void);

@ -84,10 +84,10 @@
#define GLAPIENTRYP GLAPIENTRY * #define GLAPIENTRYP GLAPIENTRY *
#endif #endif
#include "epoxy/gl_generated.h"
EPOXY_BEGIN_DECLS EPOXY_BEGIN_DECLS
#include "epoxy/gl_generated.h"
EPOXY_PUBLIC bool epoxy_has_gl_extension(const char *extension); EPOXY_PUBLIC bool epoxy_has_gl_extension(const char *extension);
EPOXY_PUBLIC bool epoxy_is_desktop_gl(void); EPOXY_PUBLIC bool epoxy_is_desktop_gl(void);
EPOXY_PUBLIC int epoxy_gl_version(void); EPOXY_PUBLIC int epoxy_gl_version(void);

@ -44,10 +44,10 @@
#define __glxext_h_ #define __glxext_h_
#endif #endif
#include "epoxy/glx_generated.h"
EPOXY_BEGIN_DECLS EPOXY_BEGIN_DECLS
#include "epoxy/glx_generated.h"
EPOXY_PUBLIC bool epoxy_has_glx_extension(Display *dpy, int screen, const char *extension); EPOXY_PUBLIC bool epoxy_has_glx_extension(Display *dpy, int screen, const char *extension);
EPOXY_PUBLIC int epoxy_glx_version(Display *dpy, int screen); EPOXY_PUBLIC int epoxy_glx_version(Display *dpy, int screen);
EPOXY_PUBLIC bool epoxy_has_glx(Display *dpy); EPOXY_PUBLIC bool epoxy_has_glx(Display *dpy);

@ -49,10 +49,10 @@
#define wglUseFontBitmaps wglUseFontBitmapsA #define wglUseFontBitmaps wglUseFontBitmapsA
#endif #endif
#include "epoxy/wgl_generated.h"
EPOXY_BEGIN_DECLS EPOXY_BEGIN_DECLS
#include "epoxy/wgl_generated.h"
EPOXY_PUBLIC bool epoxy_has_wgl_extension(HDC hdc, const char *extension); EPOXY_PUBLIC bool epoxy_has_wgl_extension(HDC hdc, const char *extension);
EPOXY_PUBLIC void epoxy_handle_external_wglMakeCurrent(void); EPOXY_PUBLIC void epoxy_handle_external_wglMakeCurrent(void);

Loading…
Cancel
Save