summaryrefslogtreecommitdiffstats
path: root/src/egl/main
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-05-04 18:55:36 +0100
committerEmil Velikov <[email protected]>2017-05-08 15:33:59 +0100
commit239e7ee91bd324bf82a37924546c4ea472e2dd2b (patch)
tree36ede0e817b73ebcb070e8d62e81c51ad9a23984 /src/egl/main
parent8d6f92313d8077bcff193a30486b875d93cdf5d5 (diff)
egl: remove suprous header eglcompiler.h
The header is used only to provide STATIC_ASSERT. The latter is already available in utils/macros.h so use that instead and kill of the header. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/egl/main')
-rw-r--r--src/egl/main/eglapi.c2
-rw-r--r--src/egl/main/eglcompiler.h46
-rw-r--r--src/egl/main/eglconfig.c2
-rw-r--r--src/egl/main/egltypedefs.h3
4 files changed, 2 insertions, 51 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index a459b9ffcdf..aa0eb94666a 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -89,7 +89,7 @@
#include "c99_compat.h"
#include "c11/threads.h"
#include "GL/mesa_glinterop.h"
-#include "eglcompiler.h"
+#include "util/macros.h"
#include "eglglobals.h"
#include "eglcontext.h"
diff --git a/src/egl/main/eglcompiler.h b/src/egl/main/eglcompiler.h
deleted file mode 100644
index 9804ca4f281..00000000000
--- a/src/egl/main/eglcompiler.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2009-2010 Chia-I Wu <[email protected]>
- * Copyright 2010 LunarG, Inc.
- * All Rights Reserved.
- *
- * 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, sub license, 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.
- *
- **************************************************************************/
-
-
-#ifndef EGLCOMPILER_INCLUDED
-#define EGLCOMPILER_INCLUDED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define STATIC_ASSERT(COND) \
- do { \
- (void) sizeof(char [1 - 2*!(COND)]); \
- } while (0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* EGLCOMPILER_INCLUDED */
diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c
index 876c8f06f27..f747c331843 100644
--- a/src/egl/main/eglconfig.c
+++ b/src/egl/main/eglconfig.c
@@ -37,8 +37,8 @@
#include <string.h>
#include <assert.h>
#include "c99_compat.h"
+#include "util/macros.h"
-#include "eglcompiler.h"
#include "eglconfig.h"
#include "egldisplay.h"
#include "eglcurrent.h"
diff --git a/src/egl/main/egltypedefs.h b/src/egl/main/egltypedefs.h
index 7facdb47f86..19524a16c42 100644
--- a/src/egl/main/egltypedefs.h
+++ b/src/egl/main/egltypedefs.h
@@ -34,9 +34,6 @@
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#include "eglcompiler.h"
-
-
#ifdef __cplusplus
extern "C" {
#endif