From: Zachary T Welch <zw@superlucidity.net>
Date: Thu, 3 Dec 2009 12:15:03 +0000 (-0800)
Subject: change #include "server.h" to <server/server.h>
X-Git-Tag: v0.4.0-rc1~153
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c538a830cdaafa92c9e9a624d84915cc39cce05b;p=openocd

change #include "server.h" to <server/server.h>

Changes from the flat namespace to heirarchical one.  Instead of writing:

	#include "server.h"

the following form should be used.

	#include <server/server.h>

The exception is from .c files in the same directory.
---

diff --git a/src/ecosboard.c b/src/ecosboard.c
index d94f8b47..53ad7bab 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -30,7 +30,7 @@
 #include <flash/nand.h>
 #include "pld.h"
 
-#include "server.h"
+#include <server/server.h>
 #include "telnet_server.h"
 #include <server/gdb_server.h>
 #include "openocd.h"
diff --git a/src/helper/log.c b/src/helper/log.c
index 3067ecc5..6adde4b9 100644
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -29,7 +29,7 @@
 
 #include "time_support.h"
 // @todo the inclusion of server.h here is a layering violation
-#include "server.h"
+#include <server/server.h>
 
 #include <stdarg.h>
 
diff --git a/src/helper/options.c b/src/helper/options.c
index 3db96fd7..573026a6 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -26,7 +26,7 @@
 
 #include "configuration.h"
 // @todo the inclusion of server.h here is a layering violation
-#include "server.h"
+#include <server/server.h>
 
 #include <getopt.h>
 
diff --git a/src/openocd.c b/src/openocd.c
index 58ad6178..cbb28b77 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -38,7 +38,7 @@
 #include "pld.h"
 #include <flash/mflash.h>
 
-#include "server.h"
+#include <server/server.h>
 #include <server/gdb_server.h>
 #include <server/httpd.h>
 
diff --git a/src/server/tcl_server.h b/src/server/tcl_server.h
index e0d7b166..68ad8212 100644
--- a/src/server/tcl_server.h
+++ b/src/server/tcl_server.h
@@ -20,7 +20,7 @@
 #ifndef _TCL_SERVER_H_
 #define _TCL_SERVER_H_
 
-#include "server.h"
+#include <server/server.h>
 
 int tcl_init(struct command_context *cmd_ctx);
 int tcl_register_commands(struct command_context *cmd_ctx);
diff --git a/src/server/telnet_server.h b/src/server/telnet_server.h
index 7e398222..b0c5ceb3 100644
--- a/src/server/telnet_server.h
+++ b/src/server/telnet_server.h
@@ -26,7 +26,7 @@
 #ifndef TELNET_SERVER_H
 #define TELNET_SERVER_H
 
-#include "server.h"
+#include <server/server.h>
 
 #define TELNET_BUFFER_SIZE (1024)