Skip to content

Commit

Permalink
Add C++ guards around generated headers
Browse files Browse the repository at this point in the history
Commit 0625a74 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: anholt#106
  • Loading branch information
ebassi committed Mar 3, 2017
1 parent 5564f9d commit 3fb4fea
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions include/epoxy/egl.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
#define __eglext_h_
#endif

#include "epoxy/egl_generated.h"

EPOXY_BEGIN_DECLS

#include "epoxy/egl_generated.h"

EPOXY_PUBLIC bool epoxy_has_egl_extension(EGLDisplay dpy, const char *extension);
EPOXY_PUBLIC int epoxy_egl_version(EGLDisplay dpy);
EPOXY_PUBLIC bool epoxy_has_egl(void);
Expand Down
4 changes: 2 additions & 2 deletions include/epoxy/gl.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
#define GLAPIENTRYP GLAPIENTRY *
#endif

#include "epoxy/gl_generated.h"

EPOXY_BEGIN_DECLS

#include "epoxy/gl_generated.h"

EPOXY_PUBLIC bool epoxy_has_gl_extension(const char *extension);
EPOXY_PUBLIC bool epoxy_is_desktop_gl(void);
EPOXY_PUBLIC int epoxy_gl_version(void);
Expand Down
4 changes: 2 additions & 2 deletions include/epoxy/glx.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
#define __glxext_h_
#endif

#include "epoxy/glx_generated.h"

EPOXY_BEGIN_DECLS

#include "epoxy/glx_generated.h"

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 bool epoxy_has_glx(Display *dpy);
Expand Down
4 changes: 2 additions & 2 deletions include/epoxy/wgl.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
#define wglUseFontBitmaps wglUseFontBitmapsA
#endif

#include "epoxy/wgl_generated.h"

EPOXY_BEGIN_DECLS

#include "epoxy/wgl_generated.h"

EPOXY_PUBLIC bool epoxy_has_wgl_extension(HDC hdc, const char *extension);
EPOXY_PUBLIC void epoxy_handle_external_wglMakeCurrent(void);

Expand Down

0 comments on commit 3fb4fea

Please sign in to comment.