shithub: scc

Download patch

ref: d56911aa4feb7fb2f32fa38f53c0d74ecf7ea4d8
parent: c4e13ecd202af5a26d6040a8f076fd14bc001e9e
author: Roberto E. Vargas Caballero <k0ga@shike2.com>
date: Sat Jan 23 02:40:34 EST 2016 

Remove double inclusion in cc1.h

It is better to follow the rule of no nested inclusion.


--- a/cc1/cc1.h
+++ b/cc1/cc1.h
@@ -1,5 +1,4 @@
 
-#include "arch.h"
 
 #define INPUTSIZ LINESIZ
 #ifndef PREFIX
--- a/cc1/code.c
+++ b/cc1/code.c
@@ -5,6 +5,7 @@
 #include <stdarg.h>
 
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 static void emitbin(unsigned, void *),
--- a/cc1/cpp.c
+++ b/cc1/cpp.c
@@ -8,6 +8,7 @@
 
 #include "../inc/sizes.h"
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 #ifndef PREFIX
--- a/cc1/decl.c
+++ b/cc1/decl.c
@@ -7,6 +7,7 @@
 
 #include "../inc/sizes.h"
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 #define NOSCLASS  0
--- a/cc1/error.c
+++ b/cc1/error.c
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 #define MAXERRNUM 10
--- a/cc1/expr.c
+++ b/cc1/expr.c
@@ -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)
--- a/cc1/fold.c
+++ b/cc1/fold.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 
--- a/cc1/init.c
+++ b/cc1/init.c
@@ -6,6 +6,7 @@
 
 #include "../inc/cc.h"
 #include "../inc/sizes.h"
+#include "arch.h"
 #include "cc1.h"
 
 
--- a/cc1/lex.c
+++ b/cc1/lex.c
@@ -8,6 +8,7 @@
 
 #include "../inc/sizes.h"
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 unsigned yytoken;
--- a/cc1/main.c
+++ b/cc1/main.c
@@ -6,6 +6,7 @@
 #include <errno.h>
 
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 
 int warnings;
--- a/cc1/stmt.c
+++ b/cc1/stmt.c
@@ -5,6 +5,7 @@
 
 #include "../inc/cc.h"
 #include "../inc/sizes.h"
+#include "arch.h"
 #include "cc1.h"
 
 Symbol *curfun;
--- a/cc1/symbol.c
+++ b/cc1/symbol.c
@@ -6,6 +6,7 @@
 
 #include "../inc/cc.h"
 #include "../inc/sizes.h"
+#include "arch.h"
 #include "cc1.h"
 
 #define NR_SYM_HASH 64
--- a/cc1/types.c
+++ b/cc1/types.c
@@ -6,6 +6,7 @@
 
 #include "../inc/sizes.h"
 #include "../inc/cc.h"
+#include "arch.h"
 #include "cc1.h"
 #include "arch.h"