From: Zachary T Welch Date: Thu, 3 Dec 2009 12:14:28 +0000 (-0800) Subject: change #include "log.h" to X-Git-Tag: v0.4.0-rc1~196 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c79cca04bed78839a18e73f3996805eb8001a812;p=openocd change #include "log.h" to Changes from the flat namespace to heirarchical one. Instead of writing: #include "log.h" the following form should be used. #include The exception is from .c files in the same directory. --- diff --git a/src/flash/common.c b/src/flash/common.c index 072e6912..17bc81c2 100644 --- a/src/flash/common.c +++ b/src/flash/common.c @@ -21,7 +21,7 @@ #endif #include "common.h" -#include "log.h" +#include unsigned get_flash_name_index(const char *name) { diff --git a/src/flash/flash.h b/src/flash/flash.h index 92727bf9..fea7372c 100644 --- a/src/flash/flash.h +++ b/src/flash/flash.h @@ -27,7 +27,7 @@ #define FLASH_H #include "target.h" -#include "log.h" +#include struct image; diff --git a/src/flash/mflash.c b/src/flash/mflash.c index 72faae22..43d8ddd3 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -25,7 +25,7 @@ #include "target.h" #include "time_support.h" #include -#include "log.h" +#include static int s3c2440_set_gpio_to_output (struct mflash_gpio_num gpio); diff --git a/src/hello.c b/src/hello.c index cfd6e2fe..0cd06adc 100644 --- a/src/hello.c +++ b/src/hello.c @@ -20,7 +20,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#include "log.h" +#include COMMAND_HANDLER(handle_foo_command) { diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index 694e2f7e..eaa0c7c7 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -24,7 +24,7 @@ #define JTAG_H #include -#include "log.h" +#include #ifdef _DEBUG_JTAG_IO_ #define DEBUG_JTAG_IO(expr ...) \ diff --git a/src/pld/pld.c b/src/pld/pld.c index df7ac0de..985e3648 100644 --- a/src/pld/pld.c +++ b/src/pld/pld.c @@ -22,7 +22,7 @@ #endif #include "pld.h" -#include "log.h" +#include #include "time_support.h" diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c index 70edbf57..1ae1ea8d 100644 --- a/src/pld/xilinx_bit.c +++ b/src/pld/xilinx_bit.c @@ -23,7 +23,7 @@ #include "xilinx_bit.h" #include "pld.h" -#include "log.h" +#include #include diff --git a/src/server/httpd_stubs.c b/src/server/httpd_stubs.c index 6c289afa..0360fe61 100644 --- a/src/server/httpd_stubs.c +++ b/src/server/httpd_stubs.c @@ -21,7 +21,7 @@ #include #endif #include "httpd.h" -#include "log.h" +#include int httpd_start(struct command_context *cmd_ctx) { diff --git a/src/server/server.h b/src/server/server.h index e632bf1e..be1afbe4 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -26,7 +26,7 @@ #ifndef SERVER_H #define SERVER_H -#include "log.h" +#include #ifdef HAVE_NETINET_IN_H #include diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c index b93df64d..29ca23ca 100644 --- a/src/target/arm_disassembler.c +++ b/src/target/arm_disassembler.c @@ -25,7 +25,7 @@ #include "target.h" #include "arm_disassembler.h" -#include "log.h" +#include /* diff --git a/src/target/arm_simulator.c b/src/target/arm_simulator.c index b96a08a1..4b8d86e7 100644 --- a/src/target/arm_simulator.c +++ b/src/target/arm_simulator.c @@ -29,7 +29,7 @@ #include "arm_simulator.h" #include #include "register.h" -#include "log.h" +#include static uint32_t arm_shift(uint8_t shift, uint32_t Rm, diff --git a/src/target/armv4_5_cache.c b/src/target/armv4_5_cache.c index 58fc0c1d..dcbcef3a 100644 --- a/src/target/armv4_5_cache.c +++ b/src/target/armv4_5_cache.c @@ -22,7 +22,7 @@ #endif #include "armv4_5_cache.h" -#include "log.h" +#include int armv4_5_identify_cache(uint32_t cache_type_reg, struct armv4_5_cache_common *cache) { diff --git a/src/target/armv4_5_mmu.c b/src/target/armv4_5_mmu.c index 4651960f..4d2fbeeb 100644 --- a/src/target/armv4_5_mmu.c +++ b/src/target/armv4_5_mmu.c @@ -21,7 +21,7 @@ #include "config.h" #endif -#include "log.h" +#include #include "target.h" #include "armv4_5_mmu.h" diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c index 2542c41a..637f681d 100644 --- a/src/target/breakpoints.c +++ b/src/target/breakpoints.c @@ -22,7 +22,7 @@ #endif #include "target.h" -#include "log.h" +#include #include "breakpoints.h" diff --git a/src/target/image.c b/src/target/image.c index ca7123ad..f8d05292 100644 --- a/src/target/image.c +++ b/src/target/image.c @@ -32,7 +32,7 @@ #include "image.h" #include "target.h" -#include "log.h" +#include /* convert ELF header field to host endianness */ diff --git a/src/target/register.c b/src/target/register.c index 392455d0..7b26b740 100644 --- a/src/target/register.c +++ b/src/target/register.c @@ -26,7 +26,7 @@ #include "types.h" #include "register.h" -#include "log.h" +#include /** * @file diff --git a/src/target/target_request.c b/src/target/target_request.c index c66cd04c..fc0ba1ac 100644 --- a/src/target/target_request.c +++ b/src/target/target_request.c @@ -32,7 +32,7 @@ #include "target_type.h" #include #include "trace.h" -#include "log.h" +#include static int charmsg_mode = 0; diff --git a/src/target/testee.c b/src/target/testee.c index f8582322..45273887 100644 --- a/src/target/testee.c +++ b/src/target/testee.c @@ -22,7 +22,7 @@ #endif #include "target.h" #include "target_type.h" -#include "log.h" +#include #include "../hello.h" static const struct command_registration testee_command_handlers[] = { diff --git a/src/target/trace.c b/src/target/trace.c index f257592b..99d6bae3 100644 --- a/src/target/trace.c +++ b/src/target/trace.c @@ -21,7 +21,7 @@ #include "config.h" #endif -#include "log.h" +#include #include "trace.h" #include "target.h"