diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2016-12-07 14:45:14 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2016-12-07 14:45:14 +0000 |
| commit | 8dead45cb366bf5c08539bef2ccaa36b80eb1483 (patch) | |
| tree | 25bdc2041b9d00d0e2e1e46ece0f96b8aaca0527 /include/epoxy/egl.h | |
| parent | 0aa9d1bc831683bfe93980eb3cffa1f0c2f058fb (diff) | |
| download | libepoxy-8dead45cb366bf5c08539bef2ccaa36b80eb1483.tar.gz | |
Revert all changes since 8bbc0d40
Most of the changes that happened after commit 8bbc0d40 broke epoxy
pretty much irreparably because of the CMake build and the attempt at
making libepoxy a static library that can be copy-pasted into another
project without generating files.
Since all the commits are entangled, and are full of unrelated changes,
we cannot simply do a localized set of reverts; instead, we need to hit
the reset button.
From this point forward, we're going to improve libepoxy's build while
attempting to keep the existing build system working. This may mean
reinstating the CMake build system at a later date.
Diffstat (limited to 'include/epoxy/egl.h')
| -rw-r--r-- | include/epoxy/egl.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/include/epoxy/egl.h b/include/epoxy/egl.h index cd0d344..f1c3f56 100644 --- a/include/epoxy/egl.h +++ b/include/epoxy/egl.h @@ -30,24 +30,23 @@ #ifndef EPOXY_EGL_H #define EPOXY_EGL_H -#if defined(__egl_h_) || defined(__eglext_h_) -#error "epoxy/egl.h" must be included before (or in place of) "EGL/egl.h" +#ifdef __cplusplus +extern "C" { #endif +#include <stdbool.h> + +#if defined(__egl_h_) || defined(__eglext_h_) +#error epoxy/egl.h must be included before (or in place of) GL/egl.h +#else #define __egl_h_ #define __eglext_h_ - -#include "epoxy/gl.h" -#include "epoxy/eglplatform.h" - -#ifdef __cplusplus -extern "C" { #endif #include "epoxy/egl_generated.h" -EPOXY_IMPORTEXPORT bool epoxy_has_egl_extension(EGLDisplay dpy, const char *extension); -EPOXY_IMPORTEXPORT int epoxy_egl_version(EGLDisplay dpy); +bool epoxy_has_egl_extension(EGLDisplay dpy, const char *extension); +int epoxy_egl_version(EGLDisplay dpy); #ifdef __cplusplus } /* extern "C" */ |