From: Zachary T Welch Date: Thu, 3 Dec 2009 12:14:47 +0000 (-0800) Subject: change #include "image.h" to X-Git-Tag: v0.4.0-rc1~169 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7da02a8330d48f05f1ea9af93adb572f083aa728;p=openocd change #include "image.h" to Changes from the flat namespace to heirarchical one. Instead of writing: #include "image.h" the following form should be used. #include The exception is from .c files in the same directory. --- diff --git a/src/flash/flash.c b/src/flash/flash.c index e910e42f..d16949da 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -29,7 +29,7 @@ #include "flash.h" #include "common.h" -#include "image.h" +#include #include static int flash_write_unlock(struct target *target, struct image *image, uint32_t *written, int erase, bool unlock); diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c index ca8f3f51..81223b68 100644 --- a/src/flash/nor/ecos.c +++ b/src/flash/nor/ecos.c @@ -23,7 +23,7 @@ #include "flash.h" #include -#include "image.h" +#include #include diff --git a/src/flash/nor/faux.c b/src/flash/nor/faux.c index caec2c79..124ca3e1 100644 --- a/src/flash/nor/faux.c +++ b/src/flash/nor/faux.c @@ -22,7 +22,7 @@ #endif #include "flash.h" -#include "image.h" +#include #include "../hello.h" diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c index cf746794..c1fefd70 100644 --- a/src/flash/nor/lpc2900.c +++ b/src/flash/nor/lpc2900.c @@ -23,7 +23,7 @@ #endif -#include "image.h" +#include #include "flash.h" #include #include diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 5cda21e2..cd8c46cd 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -33,7 +33,7 @@ #include "server.h" #include "flash.h" #include "gdb_server.h" -#include "image.h" +#include #include