From c6dd6a576d0b680f67ad9fd8af12fb342b26c83d Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Thu, 3 Dec 2009 04:14:51 -0800 Subject: [PATCH] change #include "target.h" to Changes from the flat namespace to heirarchical one. Instead of writing: #include "target.h" the following form should be used. #include The exception is from .c files in the same directory. --- src/flash/flash.h | 2 +- src/flash/mflash.c | 2 +- src/helper/command.c | 2 +- src/server/httpd.c | 2 +- src/server/server.c | 2 +- src/target/armv4_5.h | 2 +- src/target/mips32.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/flash/flash.h b/src/flash/flash.h index fea7372c4..5e31c48bc 100644 --- a/src/flash/flash.h +++ b/src/flash/flash.h @@ -26,7 +26,7 @@ #ifndef FLASH_H #define FLASH_H -#include "target.h" +#include #include struct image; diff --git a/src/flash/mflash.c b/src/flash/mflash.c index 63e71db1c..aa02e1575 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -22,7 +22,7 @@ #endif #include "mflash.h" -#include "target.h" +#include #include #include #include diff --git a/src/helper/command.c b/src/helper/command.c index d65766842..76050efd9 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -36,7 +36,7 @@ #endif // @todo the inclusion of target.h here is a layering violation -#include "target.h" +#include #include "command.h" #include "configuration.h" #include "log.h" diff --git a/src/server/httpd.c b/src/server/httpd.c index b346ca2ee..9554ff0e4 100644 --- a/src/server/httpd.c +++ b/src/server/httpd.c @@ -26,7 +26,7 @@ #endif #include "telnet_server.h" -#include "target.h" +#include #include #include diff --git a/src/server/server.c b/src/server/server.c index 0f977a76c..2f4bfb004 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -28,7 +28,7 @@ #endif #include "server.h" -#include "target.h" +#include #include "openocd.h" #include "tcl_server.h" #include "telnet_server.h" diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h index 9b6237bce..6c83c3b31 100644 --- a/src/target/armv4_5.h +++ b/src/target/armv4_5.h @@ -26,7 +26,7 @@ #ifndef ARMV4_5_H #define ARMV4_5_H -#include "target.h" +#include #include diff --git a/src/target/mips32.h b/src/target/mips32.h index ee5bd421c..98186aff9 100644 --- a/src/target/mips32.h +++ b/src/target/mips32.h @@ -23,7 +23,7 @@ #ifndef MIPS32_H #define MIPS32_H -#include "target.h" +#include #include -- 2.30.2