summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-12-03 04:15:03 -0800
committerZachary T Welch <zw@superlucidity.net>2009-12-03 04:24:49 -0800
commitc538a830cdaafa92c9e9a624d84915cc39cce05b (patch)
tree031745d2af5e15c078112a491edcf2025dd25f6b
parent6db3ed48c6d152446dafc70b8495970cd2b22d3a (diff)
downloadopenocd+libswd-c538a830cdaafa92c9e9a624d84915cc39cce05b.tar.gz
openocd+libswd-c538a830cdaafa92c9e9a624d84915cc39cce05b.tar.bz2
openocd+libswd-c538a830cdaafa92c9e9a624d84915cc39cce05b.tar.xz
openocd+libswd-c538a830cdaafa92c9e9a624d84915cc39cce05b.zip
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.
-rw-r--r--src/ecosboard.c2
-rw-r--r--src/helper/log.c2
-rw-r--r--src/helper/options.c2
-rw-r--r--src/openocd.c2
-rw-r--r--src/server/tcl_server.h2
-rw-r--r--src/server/telnet_server.h2
6 files changed, 6 insertions, 6 deletions
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)