From 90c6158d61a4b27f00997049d67344b425275c5c Mon Sep 17 00:00:00 2001 From: Yaron Cohen-Tal Date: Sun, 19 Jul 2015 12:59:31 +0300 Subject: Unite defenitions "PUBLIC" and "EPOXY_IMPORTEXPORT" and add it where appropriate. Fix tests build errors. --- include/epoxy/common.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/epoxy/egl.h | 9 ++++---- include/epoxy/gl.h | 10 +++----- include/epoxy/glx.h | 12 +++++----- include/epoxy/wgl.h | 7 +++--- 5 files changed, 80 insertions(+), 20 deletions(-) create mode 100644 include/epoxy/common.h (limited to 'include') diff --git a/include/epoxy/common.h b/include/epoxy/common.h new file mode 100644 index 0000000..e00a011 --- /dev/null +++ b/include/epoxy/common.h @@ -0,0 +1,62 @@ +/* + * Copyright © 2013 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +/** @file common.h + * + * Provides basic definitions for Epoxy. Included by all other Epoxy files. + */ + +#ifndef EPOXY_COMMON_H +#define EPOXY_COMMON_H + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined _WIN32 || defined __CYGWIN__ + #ifdef EPOXY_EXPORTS + #ifdef __GNUC__ + #define EPOXY_IMPORTEXPORT __attribute__ ((dllexport)) + #else + #define EPOXY_IMPORTEXPORT __declspec(dllexport) + #endif + #else + #ifdef __GNUC__ + #define EPOXY_IMPORTEXPORT __attribute__ ((dllimport)) + #else + #define EPOXY_IMPORTEXPORT __declspec(dllimport) + #endif + #endif +#else + #if __GNUC__ >= 4 + #define EPOXY_IMPORTEXPORT __attribute__ ((visibility ("default"))) + #else + #define EPOXY_IMPORTEXPORT + #endif +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* EPOXY_COMMON_H */ diff --git a/include/epoxy/egl.h b/include/epoxy/egl.h index bd02948..ae54929 100644 --- a/include/epoxy/egl.h +++ b/include/epoxy/egl.h @@ -30,12 +30,13 @@ #ifndef EPOXY_EGL_H #define EPOXY_EGL_H +#include +#include + #ifdef __cplusplus extern "C" { #endif -#include - #if defined(__egl_h_) || defined(__eglext_h_) #error epoxy/egl.h must be included before (or in place of) GL/egl.h #else @@ -45,8 +46,8 @@ extern "C" { #include "epoxy/egl_generated.h" -PUBLIC bool epoxy_has_egl_extension(EGLDisplay dpy, const char *extension); -PUBLIC int epoxy_egl_version(EGLDisplay dpy); +EPOXY_IMPORTEXPORT bool epoxy_has_egl_extension(EGLDisplay dpy, const char *extension); +EPOXY_IMPORTEXPORT int epoxy_egl_version(EGLDisplay dpy); #ifdef __cplusplus } /* extern "C" */ diff --git a/include/epoxy/gl.h b/include/epoxy/gl.h index 0be3a66..d150da4 100644 --- a/include/epoxy/gl.h +++ b/include/epoxy/gl.h @@ -30,12 +30,13 @@ #ifndef EPOXY_GL_H #define EPOXY_GL_H +#include +#include + #ifdef __cplusplus extern "C" { #endif -#include - #if defined(__gl_h_) || defined(__glext_h_) #error epoxy/gl.h must be included before (or in place of) GL/gl.h #else @@ -51,7 +52,6 @@ extern "C" { /* APIENTRY and GLAPIENTRY are not used on Linux or Mac. */ #define APIENTRY #define GLAPIENTRY -#define EPOXY_IMPORTEXPORT #define EPOXY_CALLSPEC #define GLAPI #define KHRONOS_APIENTRY @@ -70,10 +70,6 @@ extern "C" { #define EPOXY_CALLSPEC __stdcall #endif -#ifndef EPOXY_IMPORTEXPORT -#define EPOXY_IMPORTEXPORT __declspec(dllimport) -#endif - #ifndef GLAPI #define GLAPI extern #endif diff --git a/include/epoxy/glx.h b/include/epoxy/glx.h index 36fc617..5efe931 100644 --- a/include/epoxy/glx.h +++ b/include/epoxy/glx.h @@ -30,15 +30,15 @@ #ifndef EPOXY_GLX_H #define EPOXY_GLX_H -#ifdef __cplusplus -extern "C" { -#endif - #include #include #include #include +#ifdef __cplusplus +extern "C" { +#endif + #if defined(GLX_H) || defined(__glxext_h_) #error epoxy/glx.h must be included before (or in place of) GL/glx.h #else @@ -48,8 +48,8 @@ extern "C" { #include "epoxy/glx_generated.h" -bool epoxy_has_glx_extension(Display *dpy, int screen, const char *extension); -int epoxy_glx_version(Display *dpy, int screen); +EPOXY_IMPORTEXPORT bool epoxy_has_glx_extension(Display *dpy, int screen, const char *extension); +EPOXY_IMPORTEXPORT int epoxy_glx_version(Display *dpy, int screen); #ifdef __cplusplus } /* extern "C" */ diff --git a/include/epoxy/wgl.h b/include/epoxy/wgl.h index fdd7b4f..9ab74f8 100644 --- a/include/epoxy/wgl.h +++ b/include/epoxy/wgl.h @@ -30,13 +30,14 @@ #ifndef EPOXY_WGL_H #define EPOXY_WGL_H +#include +#include +#include + #ifdef __cplusplus extern "C" { #endif -#include -#include - #undef wglUseFontBitmaps #undef wglUseFontOutlines -- cgit v1.2.1