egl: Clean up header inclusions.

Mainly to remove eglcurrent.h and egldisplay.h from eglglobals.h.

diff --git a/src/egl/drivers/glx/egl_glx.c b/src/egl/drivers/glx/egl_glx.c
index 1c38db649159e4f949d4ed2d6c95ee1e8ec03e19..af653b86eee532895074f0f1526e53669a7f3866 100644 (file)
--- a/src/egl/drivers/glx/egl_glx.c
+++ b/src/egl/drivers/glx/egl_glx.c
@@ -43,7 +43,7 @@
 #include "eglcontext.h"
 #include "egldisplay.h"
 #include "egldriver.h"
-#include "eglglobals.h"
+#include "eglcurrent.h"
 #include "egllog.h"
 #include "eglsurface.h"
 

diff --git a/src/egl/drivers/xdri/egl_xdri.c b/src/egl/drivers/xdri/egl_xdri.c
index 2ca9ea8a5b07e397571189a9c1acb327e93e2090..10f7a31f5b950551b11b5453f92864a2a1a17530 100644 (file)
--- a/src/egl/drivers/xdri/egl_xdri.c
+++ b/src/egl/drivers/xdri/egl_xdri.c
@@ -52,7 +52,7 @@
 #include "eglcontext.h"
 #include "egldisplay.h"
 #include "egldriver.h"
-#include "eglglobals.h"
+#include "eglcurrent.h"
 #include "egllog.h"
 #include "eglsurface.h"
 

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 7e77ef1f038e40fb6404619ac0d47ecf73aecd96..364ad9c4585a6b48606cdb9d871514431e84ffbe 100644 (file)
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -60,6 +60,7 @@
 #include "egldisplay.h"
 #include "egltypedefs.h"
 #include "eglglobals.h"
+#include "eglcurrent.h"
 #include "egldriver.h"
 #include "eglsurface.h"
 #include "eglconfig.h"

diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h
index a7600820f3f75a20099cb674cdb670229d727f45..c3676ec56a13fcee119c3a91b7287e7e9f41027a 100644 (file)
--- a/src/egl/main/eglapi.h
+++ b/src/egl/main/eglapi.h
@@ -4,7 +4,7 @@
 /**
  * A generic function ptr type
  */
-typedef void (*_EGLProc)();
+typedef void (*_EGLProc)(void);
 
 
 /**

diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c
index 2db9b9401a0be5428c9566dcfaaa14324875956b..b974e40cce68822e27f17189975995909d3120c5 100644 (file)
--- a/src/egl/main/eglconfig.c
+++ b/src/egl/main/eglconfig.c
@@ -4,12 +4,11 @@
 
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include "eglconfig.h"
 #include "egldisplay.h"
-#include "eglglobals.h"
+#include "eglcurrent.h"
 #include "egllog.h"
 
 

diff --git a/src/egl/main/eglconfigutil.c b/src/egl/main/eglconfigutil.c
index ddb886c54ded75beea8d1ac17682dcd95b61076d..e416b190f0a62b7a5111f99f5c6d85846cc84918 100644 (file)
--- a/src/egl/main/eglconfigutil.c
+++ b/src/egl/main/eglconfigutil.c
@@ -4,7 +4,6 @@
 
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include "eglconfigutil.h"
 

diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c
index 4496f76ecebb3991a28c31a3a42943b40410a8e7..ee9d60e17a676e70d39368621b3a81cbebe25699 100644 (file)
--- a/src/egl/main/eglcontext.c
+++ b/src/egl/main/eglcontext.c
@@ -5,7 +5,7 @@
 #include "eglcontext.h"
 #include "egldisplay.h"
 #include "egldriver.h"
-#include "eglglobals.h"
+#include "eglcurrent.h"
 #include "eglsurface.h"
 
 

diff --git a/src/egl/main/eglcontext.h b/src/egl/main/eglcontext.h
index 4811e3bb7ad83b24c1849ef89016dcc7df2dda8d..ebb50aa60e679b9d9ea5ea874cb660fc10a880b3 100644 (file)
--- a/src/egl/main/eglcontext.h
+++ b/src/egl/main/eglcontext.h
@@ -1,4 +1,3 @@
-
 #ifndef EGLCONTEXT_INCLUDED
 #define EGLCONTEXT_INCLUDED
 

diff --git a/src/egl/main/eglcurrent.c b/src/egl/main/eglcurrent.c
index 696d04e8ba9fc1a3f1624df71f0c78892ba1ff64..a19dcf4096c44076d642c53aca2b8e523484e4ce 100644 (file)
--- a/src/egl/main/eglcurrent.c
+++ b/src/egl/main/eglcurrent.c
@@ -1,10 +1,10 @@
 #include <stdlib.h>
 #include <string.h>
-#include "eglcurrent.h"
+#include "eglglobals.h"
 #include "eglcontext.h"
 #include "egllog.h"
 #include "eglmutex.h"
-#include "eglglobals.h"
+#include "eglcurrent.h"
 
 
 /* This should be kept in sync with _eglInitThreadInfo() */

diff --git a/src/egl/main/eglcurrent.h b/src/egl/main/eglcurrent.h
index c169c93e9454b15ccbbf8524387181dfb946a4a6..e5c94ce60ab8723a68c68ae7d8b76bd90c22b4cf 100644 (file)
--- a/src/egl/main/eglcurrent.h
+++ b/src/egl/main/eglcurrent.h
@@ -1,6 +1,7 @@
 #ifndef EGLCURRENT_INCLUDED
 #define EGLCURRENT_INCLUDED
 
+
 #include "egltypedefs.h"
 
 

diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c
index d7a8d142929476580695ba70c596435a02c71598..5897372fc5347b170fa34db1648874a8de525b0e 100644 (file)
--- a/src/egl/main/egldisplay.c
+++ b/src/egl/main/egldisplay.c
@@ -10,6 +10,7 @@
 #include "egldisplay.h"
 #include "egldriver.h"
 #include "eglglobals.h"
+#include "eglcurrent.h"
 #include "eglmutex.h"
 #include "egllog.h"
 

diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
index 4aea10c3eb3700573d3a9dcdd7b43ee3e12456f3..b04b094d8472b34a7e2f6686a587d0f55b032b1a 100644 (file)
--- a/src/egl/main/egldisplay.h
+++ b/src/egl/main/egldisplay.h
@@ -1,6 +1,7 @@
 #ifndef EGLDISPLAY_INCLUDED
 #define EGLDISPLAY_INCLUDED
 
+
 #include "egltypedefs.h"
 #include "egldefines.h"
 

diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index 1dadbf783b629697cbcb1aa72150c372508a6a72..df36369ac2582e739e7ebc5f6b6326b577e45d0c 100644 (file)
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -13,6 +13,7 @@
 #include "egldisplay.h"
 #include "egldriver.h"
 #include "eglglobals.h"
+#include "eglcurrent.h"
 #include "egllog.h"
 #include "eglmisc.h"
 #include "eglmode.h"

diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h
index 6ebb60a8f100889a2372d55298bcad30c3ab978d..5149acd9640e300736fec1be1380bd60b1b47374 100644 (file)
--- a/src/egl/main/egldriver.h
+++ b/src/egl/main/egldriver.h
@@ -6,6 +6,9 @@
 #include "eglapi.h"
 
 
+typedef _EGLDriver *(*_EGLMain_t)(const char *args);
+
+
 /**
  * Base class for device drivers.
  */

diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c
index 9c4902621fcb6986c1122657950ce23458b98919..5182b18e226f0e9443abf8dcc5dfc569ab62e141 100644 (file)
--- a/src/egl/main/eglglobals.c
+++ b/src/egl/main/eglglobals.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include "eglglobals.h"
+#include "egldisplay.h"
 #include "egldriver.h"
 #include "eglmutex.h"
 

diff --git a/src/egl/main/eglglobals.h b/src/egl/main/eglglobals.h
index 5ebb914ca723c97af8730e7dc0b99ad16f3a60d5..cd1dd5851b942205c522bf6ba859f9fb8f6a1bfa 100644 (file)
--- a/src/egl/main/eglglobals.h
+++ b/src/egl/main/eglglobals.h
@@ -1,9 +1,8 @@
 #ifndef EGLGLOBALS_INCLUDED
 #define EGLGLOBALS_INCLUDED
 
+
 #include "egltypedefs.h"
-#include "egldisplay.h"
-#include "eglcurrent.h"
 #include "eglmutex.h"
 
 

diff --git a/src/egl/main/egllog.h b/src/egl/main/egllog.h
index 3a99bfea4b759da8b2a01ec7a68d3c723cf3ecb6..03bef2670f1ed287cf99356cfade29b76e71d02e 100644 (file)
--- a/src/egl/main/egllog.h
+++ b/src/egl/main/egllog.h
@@ -1,8 +1,10 @@
 #ifndef EGLLOG_INCLUDED
 #define EGLLOG_INCLUDED
 
+
 #include "egltypedefs.h"
 
+
 #define _EGL_FATAL   0   /* unrecoverable error */
 #define _EGL_WARNING 1   /* recoverable error/problem */
 #define _EGL_INFO    2   /* just useful info */

diff --git a/src/egl/main/eglmisc.c b/src/egl/main/eglmisc.c
index 5726f5bca8e367868553693a86812d61e48b646e..907a057b4420fdef3bd46d1acdf90f5bec1b096a 100644 (file)
--- a/src/egl/main/eglmisc.c
+++ b/src/egl/main/eglmisc.c
@@ -33,7 +33,7 @@
 
 #include <assert.h>
 #include <string.h>
-#include "eglglobals.h"
+#include "eglcurrent.h"
 #include "eglmisc.h"
 #include "egldisplay.h"
 

diff --git a/src/egl/main/eglmisc.h b/src/egl/main/eglmisc.h
index 829d4cde792c7f171d70513943c0dafea383c6e4..5e6a2d41df6bafbe3d85901538fc6c8312827147 100644 (file)
--- a/src/egl/main/eglmisc.h
+++ b/src/egl/main/eglmisc.h
@@ -29,7 +29,8 @@
 #ifndef EGLMISC_INCLUDED
 #define EGLMISC_INCLUDED
 
-#include "egldriver.h"
+
+#include "egltypedefs.h"
 
 
 extern const char *

diff --git a/src/egl/main/eglmode.c b/src/egl/main/eglmode.c
index 0f3ba6e5c08021ca7d652aeed36d5ce5bef53ecb..503b9e595ed38bb402014104d25b3108a3313f59 100644 (file)
--- a/src/egl/main/eglmode.c
+++ b/src/egl/main/eglmode.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -6,7 +5,7 @@
 #include "egldisplay.h"
 #include "egldriver.h"
 #include "eglmode.h"
-#include "eglglobals.h"
+#include "eglcurrent.h"
 #include "eglscreen.h"
 
 

diff --git a/src/egl/main/eglscreen.c b/src/egl/main/eglscreen.c
index 14a1e9f8fe3a10672c531241f3267ca421ab4ceb..1079a1cbe610f642838a98273595e53908f79595 100644 (file)
--- a/src/egl/main/eglscreen.c
+++ b/src/egl/main/eglscreen.c
@@ -17,6 +17,7 @@
 
 #include "egldisplay.h"
 #include "eglglobals.h"
+#include "eglcurrent.h"
 #include "eglmode.h"
 #include "eglconfig.h"
 #include "eglsurface.h"

diff --git a/src/egl/main/eglscreen.h b/src/egl/main/eglscreen.h
index d52e5388c3426f0e2e923c2cc3b2be3ed7b65c52..c400ac3d15e427b9fa99a8c2774a4ccc9209fdda 100644 (file)
--- a/src/egl/main/eglscreen.h
+++ b/src/egl/main/eglscreen.h
@@ -2,6 +2,9 @@
 #define EGLSCREEN_INCLUDED
 
 
+#include "egltypedefs.h"
+
+
 /**
  * Per-screen information.
  * Note that an EGL screen doesn't have a size.  A screen may be set to

diff --git a/src/egl/main/eglsurface.c b/src/egl/main/eglsurface.c
index 3219231ed293fc9bf9dcda7ea85220cbb746fce7..8f87239fe209971b734ea5f24668fe396bb0971b 100644 (file)
--- a/src/egl/main/eglsurface.c
+++ b/src/egl/main/eglsurface.c
@@ -9,7 +9,7 @@
 #include "egldisplay.h"
 #include "eglcontext.h"
 #include "eglconfig.h"
-#include "eglglobals.h"
+#include "eglcurrent.h"
 #include "egllog.h"
 #include "eglsurface.h"
 

diff --git a/src/egl/main/egltypedefs.h b/src/egl/main/egltypedefs.h
index e6b19b35d016b16f4f7081241e61cd633717fe52..e0c95762c67997b99e49064289a90bff3fb9723e 100644 (file)
--- a/src/egl/main/egltypedefs.h
+++ b/src/egl/main/egltypedefs.h
@@ -34,8 +34,4 @@ typedef struct _egl_surface _EGLSurface;
 
 typedef struct _egl_thread_info _EGLThreadInfo;
 
-
-typedef _EGLDriver *(*_EGLMain_t)(const char *args);
-
-
 #endif /* EGLTYPEDEFS_INCLUDED */