[hackers] [scc] Remove double inclusion in cc1.h || Roberto E. Vargas Caballero

From: <git_AT_suckless.org>
Date: Sat, 23 Jan 2016 10:20:12 +0100 (CET)

commit d56911aa4feb7fb2f32fa38f53c0d74ecf7ea4d8
Author: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
AuthorDate: Sat Jan 23 07:40:34 2016 +0100
Commit: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
CommitDate: Sat Jan 23 07:40:34 2016 +0100

    Remove double inclusion in cc1.h
    
    It is better to follow the rule of no nested inclusion.

diff --git a/cc1/cc1.h b/cc1/cc1.h
index c281143..efd4f61 100644
--- a/cc1/cc1.h
+++ b/cc1/cc1.h
_AT_@ -1,5 +1,4 @@
 
-#include "arch.h"
 
 #define INPUTSIZ LINESIZ
 #ifndef PREFIX
diff --git a/cc1/code.c b/cc1/code.c
index 651f7d7..e19f248 100644
--- a/cc1/code.c
+++ b/cc1/code.c
_AT_@ -5,6 +5,7 @@
 #include <stdarg.h>
 
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 static void emitbin(unsigned, void *),
diff --git a/cc1/cpp.c b/cc1/cpp.c
index 57c1326..240ed4e 100644
--- a/cc1/cpp.c
+++ b/cc1/cpp.c
_AT_@ -8,6 +8,7 @@
 
 #include "../inc/sizes.h"
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 #ifndef PREFIX
diff --git a/cc1/decl.c b/cc1/decl.c
index 7419d3f..17da330 100644
--- a/cc1/decl.c
+++ b/cc1/decl.c
_AT_@ -7,6 +7,7 @@
 
 #include "../inc/sizes.h"
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 #define NOSCLASS 0
diff --git a/cc1/error.c b/cc1/error.c
index f6aaa0f..bf9fbb6 100644
--- a/cc1/error.c
+++ b/cc1/error.c
_AT_@ -4,6 +4,7 @@
 #include <stdlib.h>
 
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 #define MAXERRNUM 10
diff --git a/cc1/expr.c b/cc1/expr.c
index c893617..79d7e35 100644
--- a/cc1/expr.c
+++ b/cc1/expr.c
_AT_@ -4,6 +4,7 @@
 
 #include "../inc/cc.h"
 #include "../inc/sizes.h"
+#include "arch.h"
 #include "cc1.h"
 
 #define XCHG(lp, rp, np) (np = lp, lp = rp, rp = np)
diff --git a/cc1/fold.c b/cc1/fold.c
index 7448656..429e5e5 100644
--- a/cc1/fold.c
+++ b/cc1/fold.c
_AT_@ -3,6 +3,7 @@
 #include <stdlib.h>
 
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 
diff --git a/cc1/init.c b/cc1/init.c
index ad1fd28..d7b59ae 100644
--- a/cc1/init.c
+++ b/cc1/init.c
_AT_@ -6,6 +6,7 @@
 
 #include "../inc/cc.h"
 #include "../inc/sizes.h"
+#include "arch.h"
 #include "cc1.h"
 
 
diff --git a/cc1/lex.c b/cc1/lex.c
index 092bef4..3aff6d3 100644
--- a/cc1/lex.c
+++ b/cc1/lex.c
_AT_@ -8,6 +8,7 @@
 
 #include "../inc/sizes.h"
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 unsigned yytoken;
diff --git a/cc1/main.c b/cc1/main.c
index 8b1be01..a08b7d4 100644
--- a/cc1/main.c
+++ b/cc1/main.c
_AT_@ -6,6 +6,7 @@
 #include <errno.h>
 
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 int warnings;
diff --git a/cc1/stmt.c b/cc1/stmt.c
index 9aa801c..0b40b7c 100644
--- a/cc1/stmt.c
+++ b/cc1/stmt.c
_AT_@ -5,6 +5,7 @@
 
 #include "../inc/cc.h"
 #include "../inc/sizes.h"
+#include "arch.h"
 #include "cc1.h"
 
 Symbol *curfun;
diff --git a/cc1/symbol.c b/cc1/symbol.c
index 507fe49..ee8d8b7 100644
--- a/cc1/symbol.c
+++ b/cc1/symbol.c
_AT_@ -6,6 +6,7 @@
 
 #include "../inc/cc.h"
 #include "../inc/sizes.h"
+#include "arch.h"
 #include "cc1.h"
 
 #define NR_SYM_HASH 64
diff --git a/cc1/types.c b/cc1/types.c
index fe42d22..42c5aad 100644
--- a/cc1/types.c
+++ b/cc1/types.c
_AT_@ -6,6 +6,7 @@
 
 #include "../inc/sizes.h"
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 #include "arch.h"
 
Received on Sat Jan 23 2016 - 10:20:12 CET