summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2014-04-22 14:31:39 +0200
committerEgbert Eich <eich@freedesktop.org>2014-04-30 17:27:19 +0200
commit72a9703ae45fda895b658a97d125d8f62ff664aa (patch)
tree0e40af5c77d9b5acdd754fc6a6b3b79989f84ba0
parent8fb9e1008473bc91b036dba5e9fb85f12bad7753 (diff)
Include local headers only when needed
Move inclusion of local headers from ast.h to the individual files. Include only those headers which are needed. Signed-off-by: Egbert Eich <eich@suse.de> Acked-by: Y.C. Chen <yc_chen@aspeedtech.com>
-rw-r--r--src/ast.h5
-rw-r--r--src/ast_2dtool.c2
-rw-r--r--src/ast_accel.c1
-rw-r--r--src/ast_cursor.c2
-rw-r--r--src/ast_driver.c3
-rw-r--r--src/ast_mode.c2
-rw-r--r--src/ast_vgatool.c1
7 files changed, 11 insertions, 5 deletions
diff --git a/src/ast.h b/src/ast.h
index 953f257..6001b63 100644
--- a/src/ast.h
+++ b/src/ast.h
@@ -357,8 +357,3 @@ Bool ASTUnmapMem(ScrnInfoPtr pScrn);
Bool ASTMapMMIO(ScrnInfoPtr pScrn);
void ASTUnmapMMIO(ScrnInfoPtr pScrn);
-/* Include Files */
-#include "ast_mode.h"
-#include "ast_vgatool.h"
-#include "ast_2dtool.h"
-#include "ast_cursor.h"
diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c
index 3cf83fe..b4f0a4a 100644
--- a/src/ast_2dtool.c
+++ b/src/ast_2dtool.c
@@ -48,6 +48,8 @@
/* Driver specific headers */
#include "ast.h"
+#include "ast_vgatool.h"
+#include "ast_2dtool.h"
#ifdef Accel_2D
typedef Bool (*PFN_bENABLE_CMDQ)(ScrnInfoPtr , ASTRecPtr);
diff --git a/src/ast_accel.c b/src/ast_accel.c
index 1217b01..fd91688 100644
--- a/src/ast_accel.c
+++ b/src/ast_accel.c
@@ -52,6 +52,7 @@
/* Driver specific headers */
#include "ast.h"
+#include "ast_2dtool.h"
#ifdef Accel_2D
diff --git a/src/ast_cursor.c b/src/ast_cursor.c
index 4598daa..5031aac 100644
--- a/src/ast_cursor.c
+++ b/src/ast_cursor.c
@@ -50,6 +50,8 @@
/* Driver specific headers */
#include "ast.h"
+#include "ast_vgatool.h"
+#include "ast_cursor.h"
#ifdef HWC
/* Prototype type declaration */
diff --git a/src/ast_driver.c b/src/ast_driver.c
index 863e590..b6accbf 100644
--- a/src/ast_driver.c
+++ b/src/ast_driver.c
@@ -56,6 +56,9 @@
/* Driver specific headers */
#include "ast.h"
+#include "ast_mode.h"
+#include "ast_vgatool.h"
+#include "ast_2dtool.h"
/* Mandatory functions */
static void ASTIdentify(int flags);
diff --git a/src/ast_mode.c b/src/ast_mode.c
index ceb2ddb..59488c4 100644
--- a/src/ast_mode.c
+++ b/src/ast_mode.c
@@ -52,6 +52,8 @@
/* Driver specific headers */
#include "ast.h"
+#include "ast_mode.h"
+#include "ast_vgatool.h"
static VBIOS_STDTABLE_STRUCT StdTable[] = {
/* MD_2_3_400 */
diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c
index b42ac7a..9a96ac5 100644
--- a/src/ast_vgatool.c
+++ b/src/ast_vgatool.c
@@ -52,6 +52,7 @@
/* Driver specific headers */
#include "ast.h"
+#include "ast_vgatool.h"
__inline ULONG MIndwm(UCHAR *mmiobase, ULONG r)