Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreutarass2010-05-14 20:33:48 -0400
committereutarass2010-05-14 20:33:48 -0400
commit7a539909ba65b33bf6ad386fa6440e836925d2e0 (patch)
treef5cb16b784f63e10f5efb1591afa433196a54258
parent3897de73f1382a05ce42ba824de23bd285586827 (diff)
downloadorg.eclipse.tcf.agent-7a539909ba65b33bf6ad386fa6440e836925d2e0.tar.gz
org.eclipse.tcf.agent-7a539909ba65b33bf6ad386fa6440e836925d2e0.tar.xz
org.eclipse.tcf.agent-7a539909ba65b33bf6ad386fa6440e836925d2e0.zip
TCF Agent: Bug 225082: [tcf][releng] Improve TCF Agent build directory structure:
1. #include statements changed to include directory names, because flat include can easily lead to unwanted name clashes. 2. clients now don't have to add -I to compiler command line for every source directory 3. #include "..." changed to #include <...> to allow substitution of header files by clients.
-rw-r--r--Makefile.inc5
-rw-r--r--agent.vcproj4
-rw-r--r--config.h2
-rw-r--r--framework/asyncreq.c14
-rw-r--r--framework/asyncreq.h4
-rw-r--r--framework/base64.c8
-rw-r--r--framework/base64.h2
-rw-r--r--framework/cache.c14
-rw-r--r--framework/cache.h2
-rw-r--r--framework/channel.c20
-rw-r--r--framework/channel.h6
-rw-r--r--framework/channel_tcp.c32
-rw-r--r--framework/channel_tcp.h2
-rw-r--r--framework/context.c14
-rw-r--r--framework/context.h8
-rw-r--r--framework/cpudefs.c17
-rw-r--r--framework/cpudefs.h2
-rw-r--r--framework/errors.c14
-rw-r--r--framework/events.c10
-rw-r--r--framework/exceptions.c8
-rw-r--r--framework/exceptions.h2
-rw-r--r--framework/inputbuf.c8
-rw-r--r--framework/inputbuf.h4
-rw-r--r--framework/ip_ifc.c12
-rw-r--r--framework/json.c12
-rw-r--r--framework/json.h4
-rw-r--r--framework/mdep.c8
-rw-r--r--framework/mdep.h2
-rw-r--r--framework/myalloc.c6
-rw-r--r--framework/peer.c14
-rw-r--r--framework/plugins.c8
-rw-r--r--framework/plugins.h2
-rw-r--r--framework/protocol.c16
-rw-r--r--framework/protocol.h2
-rw-r--r--framework/proxy.c14
-rw-r--r--framework/proxy.h2
-rw-r--r--framework/signames.c4
-rw-r--r--framework/streams.c8
-rw-r--r--framework/trace.c4
-rw-r--r--framework/trace.h2
-rw-r--r--framework/waitpid.c14
-rw-r--r--framework/waitpid.h2
-rw-r--r--machine/x86_64/cpudefs-mdep.h4
-rw-r--r--main/cmdline.c20
-rw-r--r--main/cmdline.h2
-rw-r--r--main/main.c24
-rw-r--r--main/main_client.c20
-rw-r--r--main/main_log.c20
-rw-r--r--main/main_lua.c20
-rw-r--r--main/main_reg.c16
-rw-r--r--main/main_va.c24
-rw-r--r--main/server.c6
-rw-r--r--main/server.h4
-rw-r--r--main/services.c44
-rw-r--r--main/services.h4
-rw-r--r--main/test.c14
-rw-r--r--main/test.h8
-rw-r--r--server/Makefile2
-rw-r--r--server/config.h2
-rw-r--r--server/main/server.c18
-rw-r--r--server/server.vcproj4
-rw-r--r--server/services/context-proxy.c24
-rw-r--r--server/services/context-proxy.h3
-rw-r--r--services/breakpoints.c38
-rw-r--r--services/breakpoints.h4
-rw-r--r--services/diagnostics.c26
-rw-r--r--services/diagnostics.h4
-rw-r--r--services/discovery.c24
-rw-r--r--services/discovery.h8
-rw-r--r--services/discovery_udp.c22
-rw-r--r--services/dwarfcache.c14
-rw-r--r--services/dwarfcache.h8
-rw-r--r--services/dwarfexpr.c18
-rw-r--r--services/dwarfexpr.h4
-rw-r--r--services/dwarfframe.c10
-rw-r--r--services/dwarfframe.h8
-rw-r--r--services/dwarfio.c12
-rw-r--r--services/dwarfio.h4
-rw-r--r--services/dwarfreloc.c8
-rw-r--r--services/dwarfreloc.h4
-rw-r--r--services/expressions.c24
-rw-r--r--services/expressions.h6
-rw-r--r--services/filesystem.c22
-rw-r--r--services/filesystem.h2
-rw-r--r--services/linenumbers.c19
-rw-r--r--services/linenumbers.h4
-rw-r--r--services/linenumbers_elf.c28
-rw-r--r--services/linenumbers_proxy.c16
-rw-r--r--services/linenumbers_win32.c18
-rw-r--r--services/memorymap.c12
-rw-r--r--services/memorymap.h6
-rw-r--r--services/memoryservice.c21
-rw-r--r--services/pathmap.c12
-rw-r--r--services/pathmap.h4
-rw-r--r--services/processes.c32
-rw-r--r--services/processes.h2
-rw-r--r--services/registers.c18
-rw-r--r--services/registers.h2
-rw-r--r--services/runctrl.c28
-rw-r--r--services/runctrl.h8
-rw-r--r--services/stacktrace.c22
-rw-r--r--services/stacktrace.h4
-rw-r--r--services/streamsservice.c18
-rw-r--r--services/streamsservice.h2
-rw-r--r--services/symbols.c16
-rw-r--r--services/symbols.h4
-rw-r--r--services/symbols_elf.c28
-rw-r--r--services/symbols_proxy.c22
-rw-r--r--services/symbols_win32.c23
-rw-r--r--services/sysmon.c16
-rw-r--r--services/sysmon.h2
-rw-r--r--services/tcf_elf.c14
-rw-r--r--services/tcf_elf.h4
-rw-r--r--system/Cygwin/context-cygwin.c2
-rw-r--r--system/Darwin/context-darwin.c24
-rw-r--r--system/FreeBSD/context-freebsd.c24
-rw-r--r--system/GNU/Linux/context-linux.c30
-rw-r--r--system/Msys/context-msys.c2
-rw-r--r--system/VxWorks/context-vxworks.c20
-rw-r--r--system/VxWorks/context-vxworks.h4
-rw-r--r--system/Windows/context-win32.c24
-rw-r--r--system/Windows/context-win32.h4
-rw-r--r--system/Windows/windbgcache.c4
-rw-r--r--system/Windows/windbgcache.h2
124 files changed, 708 insertions, 728 deletions
diff --git a/Makefile.inc b/Makefile.inc
index bf82b88b..6c992fec 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -3,7 +3,8 @@ CONF = Debug
OPSYS = $(shell uname -o 2>/dev/null || uname -s)
MACHINE = $(shell uname -m)
-SRCDIRS = . system/$(OPSYS) machine/$(MACHINE) system framework services main
+INCDIRS = . system/$(OPSYS) machine/$(MACHINE)
+SRCDIRS = $(INCDIRS) system framework services main
BINDIR = obj/$(OPSYS)/$(MACHINE)/$(CONF)
ifeq ($(CONF),Debug)
@@ -78,6 +79,6 @@ ifdef SERVICES
OPTS += $(shell $(TCF_AGENT_DIR)/bin/services-to-cflags $(SERVICES))
endif
-OPTS += $(foreach dir,$(SRCDIRS),-I$(TCF_AGENT_DIR)/$(dir))
+OPTS += $(foreach dir,$(INCDIRS),-I$(TCF_AGENT_DIR)/$(dir))
override CFLAGS += $(OPTS)
diff --git a/agent.vcproj b/agent.vcproj
index 6c591b1a..b9f029d7 100644
--- a/agent.vcproj
+++ b/agent.vcproj
@@ -44,7 +44,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,framework,services,system/Windows,machine/x86_64,main"
+ AdditionalIncludeDirectories=".;system/Windows;machine/x86_64"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
@@ -133,7 +133,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".,framework,services,system/Windows,machine/x86_64,main"
+ AdditionalIncludeDirectories=".;system/Windows;machine/x86_64"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
RuntimeLibrary="1"
diff --git a/config.h b/config.h
index 01813472..b3fcf279 100644
--- a/config.h
+++ b/config.h
@@ -20,7 +20,7 @@
#ifndef D_config
#define D_config
-#include "mdep.h"
+#include <framework/mdep.h>
#if defined(WIN32)
# define TARGET_WINDOWS 1
diff --git a/framework/asyncreq.c b/framework/asyncreq.c
index a59a985a..84dbc9bd 100644
--- a/framework/asyncreq.c
+++ b/framework/asyncreq.c
@@ -12,7 +12,7 @@
* Wind River Systems - initial API and implementation
*******************************************************************************/
-#include "config.h"
+#include <config.h>
#include <assert.h>
#include <stddef.h>
#if defined(WIN32)
@@ -20,12 +20,12 @@
#else
# include <sys/wait.h>
#endif
-#include "myalloc.h"
-#include "trace.h"
-#include "events.h"
-#include "link.h"
-#include "asyncreq.h"
-#include "errors.h"
+#include <framework/myalloc.h>
+#include <framework/trace.h>
+#include <framework/events.h>
+#include <framework/link.h>
+#include <framework/asyncreq.h>
+#include <framework/errors.h>
#define MAX_WORKER_THREADS 32
diff --git a/framework/asyncreq.h b/framework/asyncreq.h
index cc2773f7..9a8208d5 100644
--- a/framework/asyncreq.h
+++ b/framework/asyncreq.h
@@ -25,8 +25,8 @@
#ifdef __SYMBIAN32__
# include <select.h>
#endif
-#include "link.h"
-#include "events.h"
+#include <framework/link.h>
+#include <framework/events.h>
enum {
AsyncReqRead, /* File read */
diff --git a/framework/base64.c b/framework/base64.c
index 5d52e651..56a1f02d 100644
--- a/framework/base64.c
+++ b/framework/base64.c
@@ -19,11 +19,11 @@
* Also TCF version of the encoding does not allow characters outside of the BASE64 alphabet.
*/
-#include "config.h"
+#include <config.h>
#include <assert.h>
-#include "base64.h"
-#include "exceptions.h"
-#include "errors.h"
+#include <framework/base64.h>
+#include <framework/exceptions.h>
+#include <framework/errors.h>
static const char int2char[] = {
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
diff --git a/framework/base64.h b/framework/base64.h
index 22b78663..0adea6bd 100644
--- a/framework/base64.h
+++ b/framework/base64.h
@@ -22,7 +22,7 @@
#ifndef D_base64
#define D_base64
-#include "streams.h"
+#include <framework/streams.h>
/*
* Write BASE64 encoded array of bytes to output stream.
diff --git a/framework/cache.c b/framework/cache.c
index 82fa0ce5..22099421 100644
--- a/framework/cache.c
+++ b/framework/cache.c
@@ -16,14 +16,14 @@
* Abstract asynchronous data cache support.
*/
-#include "config.h"
+#include <config.h>
#include <assert.h>
-#include "errors.h"
-#include "exceptions.h"
-#include "myalloc.h"
-#include "events.h"
-#include "trace.h"
-#include "cache.h"
+#include <framework/errors.h>
+#include <framework/exceptions.h>
+#include <framework/myalloc.h>
+#include <framework/events.h>
+#include <framework/trace.h>
+#include <framework/cache.h>
typedef struct WaitingCacheClient {
CacheClient * client;
diff --git a/framework/cache.h b/framework/cache.h
index 4e105b83..e90cd1de 100644
--- a/framework/cache.h
+++ b/framework/cache.h
@@ -98,7 +98,7 @@
#ifndef D_cache
#define D_cache
-#include "channel.h"
+#include <framework/channel.h>
typedef void CacheClient(void *);
diff --git a/framework/channel.c b/framework/channel.c
index c47bca0c..d6603e2c 100644
--- a/framework/channel.c
+++ b/framework/channel.c
@@ -16,20 +16,20 @@
* Transport agnostic channel implementation.
*/
-#include "config.h"
+#include <config.h>
#include <stddef.h>
#include <errno.h>
#include <assert.h>
#include <ctype.h>
-#include "tcf.h"
-#include "channel.h"
-#include "channel_tcp.h"
-#include "myalloc.h"
-#include "events.h"
-#include "exceptions.h"
-#include "trace.h"
-#include "link.h"
-#include "json.h"
+#include <framework/tcf.h>
+#include <framework/channel.h>
+#include <framework/channel_tcp.h>
+#include <framework/myalloc.h>
+#include <framework/events.h>
+#include <framework/exceptions.h>
+#include <framework/trace.h>
+#include <framework/link.h>
+#include <framework/json.h>
#define BCAST_MAGIC 0x1463e328
diff --git a/framework/channel.h b/framework/channel.h
index 0127f80f..8e8cedf5 100644
--- a/framework/channel.h
+++ b/framework/channel.h
@@ -19,9 +19,9 @@
#ifndef D_channel
#define D_channel
-#include "streams.h"
-#include "link.h"
-#include "peer.h"
+#include <framework/streams.h>
+#include <framework/link.h>
+#include <framework/peer.h>
typedef struct TCFBroadcastGroup TCFBroadcastGroup;
struct TCFBroadcastGroup {
diff --git a/framework/channel_tcp.c b/framework/channel_tcp.c
index 678c9f0c..2b6e7a5a 100644
--- a/framework/channel_tcp.c
+++ b/framework/channel_tcp.c
@@ -18,7 +18,7 @@
* Implements input and output stream over TCP/IP transport.
*/
-#include "config.h"
+#include <config.h>
#include <fcntl.h>
#include <stddef.h>
#include <errno.h>
@@ -34,21 +34,21 @@
#else
typedef void SSL;
#endif
-#include "tcf.h"
-#include "channel.h"
-#include "channel_tcp.h"
-#include "discovery.h"
-#include "myalloc.h"
-#include "protocol.h"
-#include "errors.h"
-#include "events.h"
-#include "exceptions.h"
-#include "trace.h"
-#include "json.h"
-#include "peer.h"
-#include "ip_ifc.h"
-#include "asyncreq.h"
-#include "inputbuf.h"
+#include <framework/tcf.h>
+#include <framework/channel.h>
+#include <framework/channel_tcp.h>
+#include <framework/myalloc.h>
+#include <framework/protocol.h>
+#include <framework/errors.h>
+#include <framework/events.h>
+#include <framework/exceptions.h>
+#include <framework/trace.h>
+#include <framework/json.h>
+#include <framework/peer.h>
+#include <framework/ip_ifc.h>
+#include <framework/asyncreq.h>
+#include <framework/inputbuf.h>
+#include <services/discovery.h>
#ifndef MSG_MORE
#define MSG_MORE 0
diff --git a/framework/channel_tcp.h b/framework/channel_tcp.h
index d7a3268f..74bced7d 100644
--- a/framework/channel_tcp.h
+++ b/framework/channel_tcp.h
@@ -19,7 +19,7 @@
#ifndef D_channel_tcp
#define D_channel_tcp
-#include "channel.h"
+#include <framework/channel.h>
/*
* Start TCP channel listener.
diff --git a/framework/context.c b/framework/context.c
index 42504b9b..13108520 100644
--- a/framework/context.c
+++ b/framework/context.c
@@ -16,19 +16,11 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include "config.h"
+#include <config.h>
-#include <stdlib.h>
#include <assert.h>
-#include <errno.h>
-#include <signal.h>
-#include "context.h"
-#include "events.h"
-#include "errors.h"
-#include "trace.h"
-#include "myalloc.h"
-#include "breakpoints.h"
-#include "waitpid.h"
+#include <framework/context.h>
+#include <framework/myalloc.h>
typedef struct Listener {
ContextEventListener * func;
diff --git a/framework/context.h b/framework/context.h
index 93705bc7..53358b02 100644
--- a/framework/context.h
+++ b/framework/context.h
@@ -19,10 +19,10 @@
#ifndef D_context
#define D_context
-#include "config.h"
-#include "cpudefs.h"
-#include "errors.h"
-#include "link.h"
+#include <config.h>
+#include <framework/cpudefs.h>
+#include <framework/errors.h>
+#include <framework/link.h>
extern LINK context_root;
diff --git a/framework/cpudefs.c b/framework/cpudefs.c
index 98461167..a7bcad5f 100644
--- a/framework/cpudefs.c
+++ b/framework/cpudefs.c
@@ -16,20 +16,19 @@
* This module contains definitions of target CPU registers and stack frames.
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_DebugContext
#include <stddef.h>
#include <stdio.h>
#include <assert.h>
-#include "cpudefs.h"
-#include "errors.h"
-#include "context.h"
-#include "myalloc.h"
-#include "exceptions.h"
-#include "breakpoints.h"
-#include "symbols.h"
+#include <framework/cpudefs.h>
+#include <framework/errors.h>
+#include <framework/context.h>
+#include <framework/myalloc.h>
+#include <framework/exceptions.h>
+#include <services/symbols.h>
#if ENABLE_ContextProxy
@@ -37,7 +36,7 @@
#else
-#include "cpudefs-mdep.h"
+#include <cpudefs-mdep.h>
struct RegisterData {
REG_SET data;
diff --git a/framework/cpudefs.h b/framework/cpudefs.h
index 3a11d3ec..d59efb2f 100644
--- a/framework/cpudefs.h
+++ b/framework/cpudefs.h
@@ -19,7 +19,7 @@
#ifndef D_cpudefs
#define D_cpudefs
-#include "config.h"
+#include <config.h>
typedef struct Context Context;
diff --git a/framework/errors.c b/framework/errors.c
index 5fe08e50..bf54b2d5 100644
--- a/framework/errors.c
+++ b/framework/errors.c
@@ -16,17 +16,17 @@
* This module defines agent error codes in addition to system codes defined in errno.h
*/
-#include "config.h"
+#include <config.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#include "errors.h"
-#include "events.h"
-#include "streams.h"
-#include "myalloc.h"
-#include "json.h"
-#include "trace.h"
+#include <framework/errors.h>
+#include <framework/events.h>
+#include <framework/streams.h>
+#include <framework/myalloc.h>
+#include <framework/json.h>
+#include <framework/trace.h>
#define ERR_MESSAGE_MIN (STD_ERR_BASE + 100)
#define ERR_MESSAGE_MAX (STD_ERR_BASE + 199)
diff --git a/framework/events.c b/framework/events.c
index 5f3e6c4f..90bf6253 100644
--- a/framework/events.c
+++ b/framework/events.c
@@ -25,13 +25,13 @@
* while allows for high level of concurrency.
*/
-#include "config.h"
+#include <config.h>
#include <time.h>
#include <assert.h>
-#include "myalloc.h"
-#include "errors.h"
-#include "trace.h"
-#include "events.h"
+#include <framework/myalloc.h>
+#include <framework/errors.h>
+#include <framework/trace.h>
+#include <framework/events.h>
typedef struct event_node event_node;
diff --git a/framework/exceptions.c b/framework/exceptions.c
index ca09daa0..e16a9d8f 100644
--- a/framework/exceptions.c
+++ b/framework/exceptions.c
@@ -30,13 +30,13 @@
* Only main thread is allowed to use exceptions.
*/
-#include "config.h"
+#include <config.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#include "exceptions.h"
-#include "events.h"
-#include "trace.h"
+#include <framework/exceptions.h>
+#include <framework/events.h>
+#include <framework/trace.h>
static Trap * chain = NULL;
diff --git a/framework/exceptions.h b/framework/exceptions.h
index 016eb1c6..b89797e0 100644
--- a/framework/exceptions.h
+++ b/framework/exceptions.h
@@ -34,7 +34,7 @@
#define D_exceptions
#include <setjmp.h>
-#include "errors.h"
+#include <framework/errors.h>
typedef struct Trap Trap;
diff --git a/framework/inputbuf.c b/framework/inputbuf.c
index 9f4f046c..532f4a21 100644
--- a/framework/inputbuf.c
+++ b/framework/inputbuf.c
@@ -17,13 +17,13 @@
* Implements input buffer used by unbuffered channel transports.
*/
-#include "config.h"
+#include <config.h>
#include <stddef.h>
#include <errno.h>
#include <assert.h>
-#include "exceptions.h"
-#include "trace.h"
-#include "inputbuf.h"
+#include <framework/exceptions.h>
+#include <framework/trace.h>
+#include <framework/inputbuf.h>
static void ibuf_new_message(InputBuf * ibuf) {
ibuf->message_count++;
diff --git a/framework/inputbuf.h b/framework/inputbuf.h
index 771f780e..735aefa8 100644
--- a/framework/inputbuf.h
+++ b/framework/inputbuf.h
@@ -20,8 +20,8 @@
#ifndef D_input_buf
#define D_input_buf
-#include "config.h"
-#include "streams.h"
+#include <config.h>
+#include <framework/streams.h>
#define INPUT_BUF_SIZE 0x1000
diff --git a/framework/ip_ifc.c b/framework/ip_ifc.c
index 7543d577..7cdb845b 100644
--- a/framework/ip_ifc.c
+++ b/framework/ip_ifc.c
@@ -16,15 +16,15 @@
* Implements IP interface list.
*/
-#include "config.h"
+#include <config.h>
#include <stddef.h>
#include <errno.h>
#include <assert.h>
-#include "ip_ifc.h"
-#include "myalloc.h"
-#include "events.h"
-#include "errors.h"
-#include "trace.h"
+#include <framework/ip_ifc.h>
+#include <framework/myalloc.h>
+#include <framework/events.h>
+#include <framework/errors.h>
+#include <framework/trace.h>
#define MAX(x,y) ((x) > (y) ? (x) : (y))
diff --git a/framework/json.c b/framework/json.c
index 5d2c45de..f98a8928 100644
--- a/framework/json.c
+++ b/framework/json.c
@@ -21,13 +21,13 @@
* JSON is TCF preffered marshaling format.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
-#include "json.h"
-#include "assert.h"
-#include "myalloc.h"
-#include "exceptions.h"
-#include "base64.h"
+#include <assert.h>
+#include <framework/json.h>
+#include <framework/myalloc.h>
+#include <framework/exceptions.h>
+#include <framework/base64.h>
#define ENCODING_BINARY 0
#define ENCODING_BASE64 1
diff --git a/framework/json.h b/framework/json.h
index 9af81e09..555ca2e9 100644
--- a/framework/json.h
+++ b/framework/json.h
@@ -24,9 +24,9 @@
#ifndef D_json
#define D_json
-#include "config.h"
+#include <config.h>
#include <stdlib.h>
-#include "streams.h"
+#include <framework/streams.h>
extern int json_read_string(InputStream * inp, char * str, size_t size);
extern int json_read_boolean(InputStream * inp);
diff --git a/framework/mdep.c b/framework/mdep.c
index 0d64ca9f..6b9abe5d 100644
--- a/framework/mdep.c
+++ b/framework/mdep.c
@@ -19,13 +19,13 @@
* agent code portable between Linux, Windows, VxWorks and potentially other OSes.
*/
-#include "mdep.h"
+#include <config.h>
#include <stdio.h>
#include <assert.h>
#include <errno.h>
#include <signal.h>
-#include "myalloc.h"
-#include "errors.h"
+#include <framework/myalloc.h>
+#include <framework/errors.h>
pthread_attr_t pthread_create_attr;
@@ -922,7 +922,7 @@ int loc_clock_gettime(int clock_id, struct timespec * now) {
* Some of the dynamic IP interface scanning routines are unreliable, so
* include a workaround to manually set the desired interface from outside.
*/
-#include "ip_ifc.h"
+#include <framework/ip_ifc.h>
static ip_ifc_info* gSelectedIPInterface;
diff --git a/framework/mdep.h b/framework/mdep.h
index 5b26704d..cf7097e1 100644
--- a/framework/mdep.h
+++ b/framework/mdep.h
@@ -369,7 +369,7 @@ extern const char * loc_gai_strerror(int ecode);
#include <net/if.h>
#include <unistd.h>
-#include "link.h"
+#include <framework/link.h>
#define MAX_PATH _POSIX_PATH_MAX
#define FILE_PATH_SIZE _POSIX_PATH_MAX
diff --git a/framework/myalloc.c b/framework/myalloc.c
index b97defeb..68a08fbf 100644
--- a/framework/myalloc.c
+++ b/framework/myalloc.c
@@ -16,11 +16,11 @@
* Local memory heap manager.
*/
-#include "config.h"
+#include <config.h>
#include <string.h>
#include <assert.h>
-#include "trace.h"
-#include "myalloc.h"
+#include <framework/trace.h>
+#include <framework/myalloc.h>
void * loc_alloc(size_t size) {
void * p;
diff --git a/framework/peer.c b/framework/peer.c
index f67f2a94..37e741bc 100644
--- a/framework/peer.c
+++ b/framework/peer.c
@@ -16,16 +16,16 @@
* Implements peer server management.
*/
-#include "config.h"
+#include <config.h>
#include <stddef.h>
#include <errno.h>
#include <assert.h>
-#include "tcf.h"
-#include "peer.h"
-#include "myalloc.h"
-#include "events.h"
-#include "protocol.h"
-#include "trace.h"
+#include <framework/tcf.h>
+#include <framework/peer.h>
+#include <framework/myalloc.h>
+#include <framework/events.h>
+#include <framework/protocol.h>
+#include <framework/trace.h>
typedef struct PeersListener {
peer_server_listener fnp;
diff --git a/framework/plugins.c b/framework/plugins.c
index ff9c9f5a..f4686af6 100644
--- a/framework/plugins.c
+++ b/framework/plugins.c
@@ -20,7 +20,7 @@
* Plugins system.
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_Plugins
@@ -32,9 +32,9 @@
#include <dlfcn.h>
#include <errno.h>
-#include "trace.h"
-#include "myalloc.h"
-#include "plugins.h"
+#include <framework/trace.h>
+#include <framework/myalloc.h>
+#include <framework/plugins.h>
#define _QUOTEME(x) #x
#define QUOTE(x) _QUOTEME(x)
diff --git a/framework/plugins.h b/framework/plugins.h
index 109821f4..8b521fb0 100644
--- a/framework/plugins.h
+++ b/framework/plugins.h
@@ -23,7 +23,7 @@
#ifndef D_plugins
#define D_plugins
-#include "protocol.h"
+#include <framework/protocol.h>
/*
* Loads ALL plugins from the directory PATH_Plugins (from `config.h') in
diff --git a/framework/protocol.c b/framework/protocol.c
index ac4d6cab..76288f4d 100644
--- a/framework/protocol.c
+++ b/framework/protocol.c
@@ -20,18 +20,18 @@
* protocol is used and what services do.
*/
-#include "config.h"
+#include <config.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <assert.h>
-#include "protocol.h"
-#include "trace.h"
-#include "events.h"
-#include "events.h"
-#include "exceptions.h"
-#include "json.h"
-#include "myalloc.h"
+#include <framework/protocol.h>
+#include <framework/trace.h>
+#include <framework/events.h>
+#include <framework/events.h>
+#include <framework/exceptions.h>
+#include <framework/json.h>
+#include <framework/myalloc.h>
static const char * LOCATOR = "Locator";
diff --git a/framework/protocol.h b/framework/protocol.h
index d6cc27cd..ddea64d9 100644
--- a/framework/protocol.h
+++ b/framework/protocol.h
@@ -23,7 +23,7 @@
#ifndef D_protocol
#define D_protocol
-#include "channel.h"
+#include <framework/channel.h>
/* Time in seconds to keep remote peer data */
#define PEER_DATA_RETENTION_PERIOD 60
diff --git a/framework/proxy.c b/framework/proxy.c
index ca86a482..91c86836 100644
--- a/framework/proxy.c
+++ b/framework/proxy.c
@@ -17,15 +17,15 @@
* This service intended to be used when a client has no direct access to a target.
*/
-#include "config.h"
+#include <config.h>
#include <assert.h>
#include <string.h>
-#include "proxy.h"
-#include "protocol.h"
-#include "trace.h"
-#include "errors.h"
-#include "exceptions.h"
-#include "myalloc.h"
+#include <framework/proxy.h>
+#include <framework/protocol.h>
+#include <framework/trace.h>
+#include <framework/errors.h>
+#include <framework/exceptions.h>
+#include <framework/myalloc.h>
typedef struct Proxy {
Channel * c;
diff --git a/framework/proxy.h b/framework/proxy.h
index c11cca8a..8e2704eb 100644
--- a/framework/proxy.h
+++ b/framework/proxy.h
@@ -20,7 +20,7 @@
#ifndef D_proxy
#define D_proxy
-#include "channel.h"
+#include <framework/channel.h>
/*
* Register channel redirection callback.
diff --git a/framework/signames.c b/framework/signames.c
index 62745449..c63c44bb 100644
--- a/framework/signames.c
+++ b/framework/signames.c
@@ -16,10 +16,10 @@
* This module provides POSIX signal names and descriptions.
*/
-#include "config.h"
+#include <config.h>
#include <signal.h>
-#include "signames.h"
+#include <framework/signames.h>
#if defined(WIN32)
diff --git a/framework/streams.c b/framework/streams.c
index 00baa5ce..582a2867 100644
--- a/framework/streams.c
+++ b/framework/streams.c
@@ -16,10 +16,10 @@
* Abstract byte stream. Bytes in the stream can be divided into groups - messages.
*/
-#include "config.h"
-#include "stddef.h"
-#include "myalloc.h"
-#include "streams.h"
+#include <config.h>
+#include <stddef.h>
+#include <framework/myalloc.h>
+#include <framework/streams.h>
void write_string(OutputStream * out, const char * str) {
while (*str) write_stream(out, (*str++) & 0xff);
diff --git a/framework/trace.c b/framework/trace.c
index 6954acd2..06265854 100644
--- a/framework/trace.c
+++ b/framework/trace.c
@@ -12,8 +12,8 @@
* Wind River Systems - initial API and implementation
*******************************************************************************/
-#include "config.h"
-#include "trace.h"
+#include <config.h>
+#include <framework/trace.h>
int log_mode = LOG_EVENTS | LOG_CHILD | LOG_WAITPID | LOG_CONTEXT | LOG_PROTOCOL;
diff --git a/framework/trace.h b/framework/trace.h
index fe5c9125..45966597 100644
--- a/framework/trace.h
+++ b/framework/trace.h
@@ -19,7 +19,7 @@
#ifndef D_trace
#define D_trace
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#define LOG_ALWAYS 0x0
diff --git a/framework/waitpid.c b/framework/waitpid.c
index cf03bc62..ea53b114 100644
--- a/framework/waitpid.c
+++ b/framework/waitpid.c
@@ -16,18 +16,18 @@
* This module provides notifications of process/thread exited or stopped.
*/
-#include "config.h"
+#include <config.h>
#if (ENABLE_DebugContext && !ENABLE_ContextProxy) || SERVICE_Processes
#include <assert.h>
#include <errno.h>
-#include "errors.h"
-#include "myalloc.h"
-#include "events.h"
-#include "trace.h"
-#include "asyncreq.h"
-#include "waitpid.h"
+#include <framework/errors.h>
+#include <framework/myalloc.h>
+#include <framework/events.h>
+#include <framework/trace.h>
+#include <framework/asyncreq.h>
+#include <framework/waitpid.h>
typedef struct WaitPIDListenerInfo {
WaitPIDListener * listener;
diff --git a/framework/waitpid.h b/framework/waitpid.h
index 7ec877d1..5a5c7424 100644
--- a/framework/waitpid.h
+++ b/framework/waitpid.h
@@ -19,7 +19,7 @@
#ifndef D_waitpid
#define D_waitpid
-#include "config.h"
+#include <config.h>
#if ENABLE_DebugContext || SERVICE_Processes
diff --git a/machine/x86_64/cpudefs-mdep.h b/machine/x86_64/cpudefs-mdep.h
index aba8872e..31b297c2 100644
--- a/machine/x86_64/cpudefs-mdep.h
+++ b/machine/x86_64/cpudefs-mdep.h
@@ -22,12 +22,12 @@
# define eip pc
# undef BREAK_INST
# endif
-# include "context-vxworks.h"
+# include <system/VxWorks/context-vxworks.h>
#endif
#if defined(__i386__) || defined(__x86_64__)
-#include "regset.h"
+#include <regset.h>
#define REG_OFFSET(name) offsetof(REG_SET, name)
diff --git a/main/cmdline.c b/main/cmdline.c
index bc43729e..725fad35 100644
--- a/main/cmdline.c
+++ b/main/cmdline.c
@@ -17,7 +17,7 @@
* Command line interpreter.
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_Cmdline
@@ -26,15 +26,15 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-#include "cmdline.h"
-#include "events.h"
-#include "errors.h"
-#include "myalloc.h"
-#include "peer.h"
-#include "protocol.h"
-#include "trace.h"
-#include "channel.h"
-#include "plugins.h"
+#include <framework/events.h>
+#include <framework/errors.h>
+#include <framework/myalloc.h>
+#include <framework/peer.h>
+#include <framework/protocol.h>
+#include <framework/trace.h>
+#include <framework/channel.h>
+#include <framework/plugins.h>
+#include <main/cmdline.h>
struct cmd {
char * cmd;
diff --git a/main/cmdline.h b/main/cmdline.h
index f114cb16..392a3497 100644
--- a/main/cmdline.h
+++ b/main/cmdline.h
@@ -21,7 +21,7 @@
#if ENABLE_Cmdline
-#include "protocol.h"
+#include <framework/protocol.h>
extern void cmdline_suspend(void);
extern void cmdline_resume(void);
diff --git a/main/main.c b/main/main.c
index bc47e504..62aa85a9 100644
--- a/main/main.c
+++ b/main/main.c
@@ -16,23 +16,23 @@
* Agent main module.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
-#include "asyncreq.h"
-#include "events.h"
-#include "errors.h"
-#include "trace.h"
-#include "test.h"
-#include "cmdline.h"
-#include "channel_tcp.h"
-#include "discovery.h"
-#include "plugins.h"
-#include "services.h"
-#include "server.h"
+#include <framework/asyncreq.h>
+#include <framework/events.h>
+#include <framework/errors.h>
+#include <framework/trace.h>
+#include <framework/channel_tcp.h>
+#include <framework/plugins.h>
+#include <services/discovery.h>
+#include <main/test.h>
+#include <main/cmdline.h>
+#include <main/services.h>
+#include <main/server.h>
static const char * progname;
diff --git a/main/main_client.c b/main/main_client.c
index 130b8344..0a4caf48 100644
--- a/main/main_client.c
+++ b/main/main_client.c
@@ -16,21 +16,21 @@
* Agent main module.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
-#include "asyncreq.h"
-#include "events.h"
-#include "trace.h"
-#include "channel.h"
-#include "protocol.h"
-#include "proxy.h"
-#include "discovery.h"
-#include "cmdline.h"
-#include "plugins.h"
+#include <framework/asyncreq.h>
+#include <framework/events.h>
+#include <framework/trace.h>
+#include <framework/channel.h>
+#include <framework/protocol.h>
+#include <framework/proxy.h>
+#include <framework/plugins.h>
+#include <services/discovery.h>
+#include <main/cmdline.h>
static const char * progname;
static Protocol * proto;
diff --git a/main/main_log.c b/main/main_log.c
index 883d1aeb..eb7a7d8c 100644
--- a/main/main_log.c
+++ b/main/main_log.c
@@ -21,21 +21,21 @@
* It can be used as diagnostic and debugging tool.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
-#include "asyncreq.h"
-#include "events.h"
-#include "trace.h"
-#include "myalloc.h"
-#include "channel.h"
-#include "protocol.h"
-#include "proxy.h"
-#include "discovery.h"
-#include "errors.h"
+#include <framework/asyncreq.h>
+#include <framework/events.h>
+#include <framework/trace.h>
+#include <framework/myalloc.h>
+#include <framework/channel.h>
+#include <framework/protocol.h>
+#include <framework/proxy.h>
+#include <framework/errors.h>
+#include <services/discovery.h>
static const char * progname;
static const char * dest_url = "TCP::1534";
diff --git a/main/main_lua.c b/main/main_lua.c
index f47d3859..86bd771e 100644
--- a/main/main_lua.c
+++ b/main/main_lua.c
@@ -16,7 +16,7 @@
* Agent main module.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
@@ -37,15 +37,15 @@ extern "C" {
}
#endif
-#include "asyncreq.h"
-#include "events.h"
-#include "trace.h"
-#include "channel.h"
-#include "protocol.h"
-#include "proxy.h"
-#include "discovery.h"
-#include "myalloc.h"
-#include "errors.h"
+#include <framework/asyncreq.h>
+#include <framework/events.h>
+#include <framework/trace.h>
+#include <framework/channel.h>
+#include <framework/protocol.h>
+#include <framework/proxy.h>
+#include <framework/myalloc.h>
+#include <framework/errors.h>
+#include <services/discovery.h>
static const char * progname;
static lua_State *luastate;
diff --git a/main/main_reg.c b/main/main_reg.c
index e77823c4..2f03ad2c 100644
--- a/main/main_reg.c
+++ b/main/main_reg.c
@@ -18,19 +18,19 @@
* All it does is running TCF UDP auto-discovery protocol.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
-#include "asyncreq.h"
-#include "events.h"
-#include "trace.h"
-#include "channel.h"
-#include "protocol.h"
-#include "proxy.h"
-#include "discovery.h"
+#include <framework/asyncreq.h>
+#include <framework/events.h>
+#include <framework/trace.h>
+#include <framework/channel.h>
+#include <framework/protocol.h>
+#include <framework/proxy.h>
+#include <services/discovery.h>
static const char * progname;
diff --git a/main/main_va.c b/main/main_va.c
index abae2ec4..9b0020b5 100644
--- a/main/main_va.c
+++ b/main/main_va.c
@@ -21,23 +21,23 @@
* The code is intended to be an example of service proxing implementation.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
-#include "asyncreq.h"
-#include "events.h"
-#include "trace.h"
-#include "myalloc.h"
-#include "json.h"
-#include "channel.h"
-#include "protocol.h"
-#include "proxy.h"
-#include "discovery.h"
-#include "errors.h"
-#include "plugins.h"
+#include <framework/asyncreq.h>
+#include <framework/events.h>
+#include <framework/trace.h>
+#include <framework/myalloc.h>
+#include <framework/json.h>
+#include <framework/channel.h>
+#include <framework/protocol.h>
+#include <framework/proxy.h>
+#include <framework/errors.h>
+#include <framework/plugins.h>
+#include <services/discovery.h>
static const char * progname;
static Protocol * proto;
diff --git a/main/server.c b/main/server.c
index 97a5c9b2..b356fe52 100644
--- a/main/server.c
+++ b/main/server.c
@@ -16,11 +16,11 @@
* Server initialization code.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
-#include "errors.h"
-#include "server.h"
+#include <framework/errors.h>
+#include <main/server.h>
static Protocol * proto;
static TCFBroadcastGroup * bcg;
diff --git a/main/server.h b/main/server.h
index 51fea9d7..15155d57 100644
--- a/main/server.h
+++ b/main/server.h
@@ -19,8 +19,8 @@
#ifndef D_server
#define D_server
-#include "config.h"
-#include "protocol.h"
+#include <config.h>
+#include <framework/protocol.h>
extern void ini_server(const char * url, Protocol * proto, TCFBroadcastGroup * bcg);
diff --git a/main/services.c b/main/services.c
index 471c579e..5abc02ea 100644
--- a/main/services.c
+++ b/main/services.c
@@ -16,30 +16,30 @@
* Services initialization code.
*/
-#include "config.h"
+#include <config.h>
-#include "services.h"
-#include "discovery.h"
-#include "runctrl.h"
-#include "breakpoints.h"
-#include "memoryservice.h"
-#include "memorymap.h"
-#include "registers.h"
-#include "stacktrace.h"
-#include "symbols.h"
-#include "linenumbers.h"
-#include "processes.h"
-#include "filesystem.h"
-#include "sysmon.h"
-#include "diagnostics.h"
-#include "expressions.h"
-#include "streamsservice.h"
-#include "pathmap.h"
-#include "proxy.h"
-#include "tcf_elf.h"
-#include "plugins.h"
+#include <framework/proxy.h>
+#include <framework/plugins.h>
+#include <services/discovery.h>
+#include <services/runctrl.h>
+#include <services/breakpoints.h>
+#include <services/memoryservice.h>
+#include <services/memorymap.h>
+#include <services/registers.h>
+#include <services/stacktrace.h>
+#include <services/symbols.h>
+#include <services/linenumbers.h>
+#include <services/processes.h>
+#include <services/filesystem.h>
+#include <services/sysmon.h>
+#include <services/diagnostics.h>
+#include <services/expressions.h>
+#include <services/streamsservice.h>
+#include <services/pathmap.h>
+#include <services/tcf_elf.h>
+#include <main/services.h>
-#include <services-ext.h>
+#include <main/services-ext.h>
void ini_services(Protocol * proto, TCFBroadcastGroup * bcg) {
#if SERVICE_Locator
diff --git a/main/services.h b/main/services.h
index f8cac2e8..b73475fa 100644
--- a/main/services.h
+++ b/main/services.h
@@ -19,8 +19,8 @@
#ifndef D_services
#define D_services
-#include "config.h"
-#include "protocol.h"
+#include <config.h>
+#include <framework/protocol.h>
extern void ini_services(Protocol * proto, TCFBroadcastGroup * bcg);
diff --git a/main/test.c b/main/test.c
index c0050dd7..b8658b7b 100644
--- a/main/test.c
+++ b/main/test.c
@@ -16,7 +16,7 @@
* Agent self-testing service.
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_RCBP_TEST
@@ -25,13 +25,13 @@
#include <errno.h>
#include <signal.h>
#include <assert.h>
-#include "myalloc.h"
-#include "test.h"
-#include "trace.h"
-#include "diagnostics.h"
-#include "errors.h"
+#include <framework/myalloc.h>
+#include <framework/trace.h>
+#include <framework/errors.h>
+#include <services/diagnostics.h>
+#include <main/test.h>
#if defined(WIN32)
-# include "system/Windows/context-win32.h"
+# include <system/Windows/context-win32.h>
#endif
typedef enum test_enum {
diff --git a/main/test.h b/main/test.h
index 33e4a349..24aa2aba 100644
--- a/main/test.h
+++ b/main/test.h
@@ -19,12 +19,12 @@
#ifndef D_test
#define D_test
-#include "config.h"
+#include <config.h>
#if ENABLE_RCBP_TEST
-#include "context.h"
-#include "symbols.h"
+#include <framework/context.h>
+#include <services/symbols.h>
extern void test_proc(void);
extern int run_test_process(ContextAttachCallBack * done, void * data);
@@ -32,7 +32,7 @@ extern int find_test_symbol(Context * ctx, char * name, void ** addr, int * sym_
#else /* ENABLE_RCBP_TEST */
-#include "errors.h"
+#include <framework/errors.h>
#define find_test_symbol(ctx, name, addr, sym_class) (errno = ERR_SYM_NOT_FOUND, -1)
diff --git a/server/Makefile b/server/Makefile
index 28fd90cd..3f459abb 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -2,7 +2,7 @@ TCF_AGENT_DIR=../agent
include $(TCF_AGENT_DIR)/Makefile.inc
-override CFLAGS := $(foreach dir,$(SRCDIRS),-I$(dir)) $(CFLAGS)
+override CFLAGS := $(foreach dir,$(INCDIRS),-I$(dir)) $(CFLAGS)
HFILES := $(foreach dir,$(SRCDIRS),$(wildcard $(dir)/*.h)) $(HFILES)
CFILES := $(sort $(foreach dir,$(SRCDIRS),$(wildcard $(dir)/*.c)) $(CFILES))
diff --git a/server/config.h b/server/config.h
index 342909cf..7fe07485 100644
--- a/server/config.h
+++ b/server/config.h
@@ -15,7 +15,7 @@
#ifndef D_config
#define D_config
-#include "mdep.h"
+#include <framework/mdep.h>
#if !defined(SERVICE_Locator)
#define SERVICE_Locator 1
diff --git a/server/main/server.c b/server/main/server.c
index cb85ad16..0a2aab65 100644
--- a/server/main/server.c
+++ b/server/main/server.c
@@ -16,17 +16,17 @@
* Server initialization code.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
-#include "errors.h"
-#include "myalloc.h"
-#include "proxy.h"
-#include "linenumbers.h"
-#include "symbols.h"
-#include "pathmap.h"
-#include "context-proxy.h"
-#include "server.h"
+#include <framework/errors.h>
+#include <framework/myalloc.h>
+#include <framework/proxy.h>
+#include <services/linenumbers.h>
+#include <services/symbols.h>
+#include <services/pathmap.h>
+#include <services/context-proxy.h>
+#include <main/server.h>
static Protocol * proto;
static TCFBroadcastGroup * bcg;
diff --git a/server/server.vcproj b/server/server.vcproj
index 7bddfc4b..73851132 100644
--- a/server/server.vcproj
+++ b/server/server.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;services;main;../agent;../agent/framework;../agent/services;../agent/main"
+ AdditionalIncludeDirectories=".;../agent"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -119,7 +119,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=".;services;main;../agent;../agent/framework;../agent/services;../agent/main"
+ AdditionalIncludeDirectories=".;../agent"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
diff --git a/server/services/context-proxy.c b/server/services/context-proxy.c
index 4beee331..f1161258 100644
--- a/server/services/context-proxy.c
+++ b/server/services/context-proxy.c
@@ -16,24 +16,24 @@
* This module forwards handling of process/thread OS contexts to remote peer.
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_DebugContext && ENABLE_ContextProxy
#include <errno.h>
#include <stdio.h>
#include <assert.h>
-#include "context.h"
-#include "myalloc.h"
-#include "trace.h"
-#include "exceptions.h"
-#include "protocol.h"
-#include "json.h"
-#include "cache.h"
-#include "pathmap.h"
-#include "memorymap.h"
-#include "stacktrace.h"
-#include "context-proxy.h"
+#include <framework/context.h>
+#include <framework/myalloc.h>
+#include <framework/trace.h>
+#include <framework/exceptions.h>
+#include <framework/protocol.h>
+#include <framework/json.h>
+#include <framework/cache.h>
+#include <services/pathmap.h>
+#include <services/memorymap.h>
+#include <services/stacktrace.h>
+#include <services/context-proxy.h>
typedef struct ContextCache ContextCache;
typedef struct MemoryCache MemoryCache;
diff --git a/server/services/context-proxy.h b/server/services/context-proxy.h
index 3217654e..fcd9f00d 100644
--- a/server/services/context-proxy.h
+++ b/server/services/context-proxy.h
@@ -19,7 +19,8 @@
#ifndef D_context_proxy
#define D_context_proxy
-#include "channel.h"
+#include <config.h>
+#include <framework/channel.h>
extern void create_context_proxy(Channel * host, Channel * target);
diff --git a/services/breakpoints.c b/services/breakpoints.c
index 75db73a9..5cf5c75e 100644
--- a/services/breakpoints.c
+++ b/services/breakpoints.c
@@ -19,34 +19,34 @@
* when a program's execution should be interrupted.
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_Breakpoints
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#include "breakpoints.h"
-#include "expressions.h"
-#include "channel.h"
-#include "protocol.h"
-#include "errors.h"
-#include "trace.h"
-#include "runctrl.h"
-#include "context.h"
-#include "myalloc.h"
-#include "exceptions.h"
-#include "symbols.h"
-#include "cache.h"
-#include "json.h"
-#include "link.h"
-#include "linenumbers.h"
-#include "stacktrace.h"
-#include "memorymap.h"
+#include <framework/channel.h>
+#include <framework/protocol.h>
+#include <framework/errors.h>
+#include <framework/trace.h>
+#include <framework/context.h>
+#include <framework/myalloc.h>
+#include <framework/exceptions.h>
+#include <framework/cache.h>
+#include <framework/json.h>
+#include <framework/link.h>
+#include <services/symbols.h>
+#include <services/runctrl.h>
+#include <services/breakpoints.h>
+#include <services/expressions.h>
+#include <services/linenumbers.h>
+#include <services/stacktrace.h>
+#include <services/memorymap.h>
#if defined(_WRS_KERNEL)
# include <private/vxdbgLibP.h>
-# include "system/VxWorks/context-vxworks.h"
+# include <system/VxWorks/context-vxworks.h>
#endif
typedef struct BreakpointClient BreakpointClient;
diff --git a/services/breakpoints.h b/services/breakpoints.h
index b4008ab3..44737923 100644
--- a/services/breakpoints.h
+++ b/services/breakpoints.h
@@ -22,8 +22,8 @@
#ifndef D_breakpoints
#define D_breakpoints
-#include "context.h"
-#include "protocol.h"
+#include <framework/context.h>
+#include <framework/protocol.h>
typedef struct BreakpointInfo BreakpointInfo;
diff --git a/services/diagnostics.c b/services/diagnostics.c
index 99e587d7..65a63659 100644
--- a/services/diagnostics.c
+++ b/services/diagnostics.c
@@ -17,28 +17,28 @@
* This service is used for framework and agents testing.
*/
-#include "config.h"
+#include <config.h>
#include <signal.h>
#include <assert.h>
#include <stdio.h>
-#include "diagnostics.h"
-#include "protocol.h"
-#include "json.h"
-#include "exceptions.h"
-#include "context.h"
-#include "myalloc.h"
+#include <framework/protocol.h>
+#include <framework/json.h>
+#include <framework/exceptions.h>
+#include <framework/context.h>
+#include <framework/myalloc.h>
+#include <framework/cache.h>
#if ENABLE_Symbols
-# include "symbols.h"
-# include "stacktrace.h"
-# include "cache.h"
+# include <services/symbols.h>
+# include <services/stacktrace.h>
#endif
#if SERVICE_Streams
-# include "streamsservice.h"
+# include <services/streamsservice.h>
#endif
#if ENABLE_RCBP_TEST
-# include "test.h"
-# include "runctrl.h"
+# include <main/test.h>
+# include <services/runctrl.h>
#endif
+#include <services/diagnostics.h>
static const char * DIAGNOSTICS = "Diagnostics";
diff --git a/services/diagnostics.h b/services/diagnostics.h
index 34a4d48f..40e61599 100644
--- a/services/diagnostics.h
+++ b/services/diagnostics.h
@@ -20,8 +20,8 @@
#ifndef D_diagnostics
#define D_diagnostics
-#include "protocol.h"
-#include "context.h"
+#include <framework/protocol.h>
+#include <framework/context.h>
extern int is_test_process(Context * ctx);
diff --git a/services/discovery.c b/services/discovery.c
index 9b0aff24..eb393caf 100644
--- a/services/discovery.c
+++ b/services/discovery.c
@@ -16,22 +16,22 @@
* Implements auto-discovery and Locator service.
*/
-#include "config.h"
+#include <config.h>
#include <stddef.h>
#include <errno.h>
#include <assert.h>
-#include "discovery.h"
-#include "discovery_udp.h"
-#include "protocol.h"
-#include "channel.h"
-#include "proxy.h"
-#include "myalloc.h"
-#include "events.h"
-#include "trace.h"
-#include "exceptions.h"
-#include "json.h"
-#include "peer.h"
+#include <framework/protocol.h>
+#include <framework/channel.h>
+#include <framework/proxy.h>
+#include <framework/myalloc.h>
+#include <framework/events.h>
+#include <framework/trace.h>
+#include <framework/exceptions.h>
+#include <framework/json.h>
+#include <framework/peer.h>
+#include <services/discovery.h>
+#include <services/discovery_udp.h>
#if SERVICE_Locator
diff --git a/services/discovery.h b/services/discovery.h
index 4e2c6708..f3864060 100644
--- a/services/discovery.h
+++ b/services/discovery.h
@@ -19,10 +19,10 @@
#ifndef D_discovery
#define D_discovery
-#include "config.h"
-#include "protocol.h"
-#include "channel.h"
-#include "link.h"
+#include <config.h>
+#include <framework/protocol.h>
+#include <framework/channel.h>
+#include <framework/link.h>
#define DISCOVERY_TCF_PORT 1534
diff --git a/services/discovery_udp.c b/services/discovery_udp.c
index 863f3382..08b9a685 100644
--- a/services/discovery_udp.c
+++ b/services/discovery_udp.c
@@ -34,23 +34,23 @@
* and uses unicast packets to sent info to agents from the list.
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_Discovery
#include <stddef.h>
#include <errno.h>
#include <assert.h>
-#include "tcf.h"
-#include "discovery.h"
-#include "discovery_udp.h"
-#include "myalloc.h"
-#include "events.h"
-#include "errors.h"
-#include "trace.h"
-#include "peer.h"
-#include "ip_ifc.h"
-#include "asyncreq.h"
+#include <framework/tcf.h>
+#include <framework/myalloc.h>
+#include <framework/events.h>
+#include <framework/errors.h>
+#include <framework/trace.h>
+#include <framework/peer.h>
+#include <framework/ip_ifc.h>
+#include <framework/asyncreq.h>
+#include <services/discovery.h>
+#include <services/discovery_udp.h>
#define MAX_IFC 10
#define MAX_RECV_ERRORS 8
diff --git a/services/dwarfcache.c b/services/dwarfcache.c
index 7c43dd12..5adf7a58 100644
--- a/services/dwarfcache.c
+++ b/services/dwarfcache.c
@@ -18,17 +18,17 @@
* Functions in this module use exceptions to report errors, see exceptions.h
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_ELF
#include <assert.h>
-#include "dwarf.h"
-#include "dwarfio.h"
-#include "dwarfcache.h"
-#include "dwarfexpr.h"
-#include "exceptions.h"
-#include "myalloc.h"
+#include <framework/exceptions.h>
+#include <framework/myalloc.h>
+#include <services/dwarf.h>
+#include <services/dwarfio.h>
+#include <services/dwarfcache.h>
+#include <services/dwarfexpr.h>
#define OBJ_HASH_SIZE (0x10000-1)
diff --git a/services/dwarfcache.h b/services/dwarfcache.h
index d854a7a2..bedaac32 100644
--- a/services/dwarfcache.h
+++ b/services/dwarfcache.h
@@ -23,13 +23,13 @@
#ifndef D_dwarfcache
#define D_dwarfcache
-#include "config.h"
+#include <config.h>
#if ENABLE_ELF
-#include "tcf_elf.h"
-#include "dwarfio.h"
-#include "errors.h"
+#include <services/tcf_elf.h>
+#include <services/dwarfio.h>
+#include <framework/errors.h>
typedef struct FileInfo FileInfo;
typedef struct LocationInfo LocationInfo;
diff --git a/services/dwarfexpr.c b/services/dwarfexpr.c
index e426bb3e..cd88ab45 100644
--- a/services/dwarfexpr.c
+++ b/services/dwarfexpr.c
@@ -16,20 +16,20 @@
* This module implements DWARF expressions evaluation.
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_ELF
#include <assert.h>
#include <stdio.h>
-#include "myalloc.h"
-#include "dwarf.h"
-#include "dwarfio.h"
-#include "dwarfexpr.h"
-#include "exceptions.h"
-#include "stacktrace.h"
-#include "errors.h"
-#include "trace.h"
+#include <framework/myalloc.h>
+#include <framework/exceptions.h>
+#include <framework/errors.h>
+#include <framework/trace.h>
+#include <services/dwarf.h>
+#include <services/dwarfio.h>
+#include <services/dwarfexpr.h>
+#include <services/stacktrace.h>
static U8_T * sExprStack = NULL;
static unsigned sExprStackLen = 0;
diff --git a/services/dwarfexpr.h b/services/dwarfexpr.h
index bf18ccb2..6835cb51 100644
--- a/services/dwarfexpr.h
+++ b/services/dwarfexpr.h
@@ -20,11 +20,11 @@
#ifndef D_dwarfexpr
#define D_dwarfexpr
-#include "config.h"
+#include <config.h>
#if ENABLE_ELF
-#include "dwarfcache.h"
+#include <services/dwarfcache.h>
extern void dwarf_evaluate_expression(U8_T base, PropertyValue * value);
diff --git a/services/dwarfframe.c b/services/dwarfframe.c
index 9d73a01b..0d6ff8a4 100644
--- a/services/dwarfframe.c
+++ b/services/dwarfframe.c
@@ -18,16 +18,16 @@
* Functions in this module use exceptions to report errors, see exceptions.h
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_ELF
#include <assert.h>
#include <stdio.h>
-#include "dwarfio.h"
-#include "dwarfframe.h"
-#include "exceptions.h"
-#include "myalloc.h"
+#include <framework/exceptions.h>
+#include <framework/myalloc.h>
+#include <services/dwarfio.h>
+#include <services/dwarfframe.h>
#define EH_PE_omit 0xff
diff --git a/services/dwarfframe.h b/services/dwarfframe.h
index d90d0eec..c8d75fbe 100644
--- a/services/dwarfframe.h
+++ b/services/dwarfframe.h
@@ -21,13 +21,13 @@
#ifndef D_dwarfframe
#define D_dwarfframe
-#include "config.h"
+#include <config.h>
#if ENABLE_ELF
-#include "context.h"
-#include "dwarfcache.h"
-#include "stacktrace.h"
+#include <framework/context.h>
+#include <services/dwarfcache.h>
+#include <services/stacktrace.h>
/*
* Lookup stack tracing information in ELF file, in .debug_frame and .eh_frame sections.
diff --git a/services/dwarfio.c b/services/dwarfio.c
index 6c6ec9ca..dcc54181 100644
--- a/services/dwarfio.c
+++ b/services/dwarfio.c
@@ -18,17 +18,17 @@
* Functions in this module use exceptions to report errors, see exceptions.h
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_ELF
#include <assert.h>
#include <string.h>
-#include "dwarfio.h"
-#include "dwarfreloc.h"
-#include "dwarf.h"
-#include "myalloc.h"
-#include "exceptions.h"
+#include <framework/myalloc.h>
+#include <framework/exceptions.h>
+#include <services/dwarfio.h>
+#include <services/dwarfreloc.h>
+#include <services/dwarf.h>
#define ABBREV_TABLE_SIZE 127
diff --git a/services/dwarfio.h b/services/dwarfio.h
index c0974efa..6f379ad5 100644
--- a/services/dwarfio.h
+++ b/services/dwarfio.h
@@ -20,11 +20,11 @@
#ifndef D_dwarfio
#define D_dwarfio
-#include "config.h"
+#include <config.h>
#if ENABLE_ELF
-#include "tcf_elf.h"
+#include <services/tcf_elf.h>
typedef struct DIO_UnitDescriptor {
ELF_File * mFile;
diff --git a/services/dwarfreloc.c b/services/dwarfreloc.c
index 8bd11175..a6ed56b7 100644
--- a/services/dwarfreloc.c
+++ b/services/dwarfreloc.c
@@ -18,13 +18,13 @@
* Functions in this module use exceptions to report errors, see exceptions.h
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_ELF
#include <assert.h>
-#include "exceptions.h"
-#include "dwarfreloc.h"
+#include <framework/exceptions.h>
+#include <services/dwarfreloc.h>
static ELF_Section * section = NULL;
static ELF_Section * relocs = NULL;
@@ -40,7 +40,7 @@ static void * data_buf = NULL;
static size_t data_size = 0;
#define elf_relocate elf_relocate_i386
-#include "machine/i386/elf-mdep.h"
+#include <machine/i386/elf-mdep.h>
#undef elf_relocate
typedef struct ElfRelocateFunc {
diff --git a/services/dwarfreloc.h b/services/dwarfreloc.h
index 85afc986..19c42cc9 100644
--- a/services/dwarfreloc.h
+++ b/services/dwarfreloc.h
@@ -21,11 +21,11 @@
#ifndef D_dwarfreloc
#define D_dwarfreloc
-#include "config.h"
+#include <config.h>
#if ENABLE_ELF
-#include "tcf_elf.h"
+#include <services/tcf_elf.h>
extern void drl_relocate(ELF_Section * s, U8_T offset, void * buf, size_t size, ELF_Section ** dst);
diff --git a/services/expressions.c b/services/expressions.c
index 6dfbf0a3..5518b0e1 100644
--- a/services/expressions.c
+++ b/services/expressions.c
@@ -16,7 +16,7 @@
* Expression evaluation service.
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_Expressions
@@ -25,19 +25,15 @@
#include <stdio.h>
#include <assert.h>
#include <string.h>
-#include "myalloc.h"
-#include "exceptions.h"
-#include "stacktrace.h"
-#include "symbols.h"
-#include "breakpoints.h"
-#include "expressions.h"
-#include "json.h"
-#include "cache.h"
-#include "context.h"
-#include "stacktrace.h"
-#include "breakpoints.h"
-#include "test.h"
-#include "symbols.h"
+#include <framework/myalloc.h>
+#include <framework/exceptions.h>
+#include <framework/json.h>
+#include <framework/cache.h>
+#include <framework/context.h>
+#include <services/symbols.h>
+#include <services/stacktrace.h>
+#include <services/expressions.h>
+#include <main/test.h>
#define STR_POOL_SIZE 1024
diff --git a/services/expressions.h b/services/expressions.h
index 12f50154..22a2180c 100644
--- a/services/expressions.h
+++ b/services/expressions.h
@@ -19,9 +19,9 @@
#ifndef D_expression
#define D_expression
-#include "protocol.h"
-#include "context.h"
-#include "symbols.h"
+#include <framework/protocol.h>
+#include <framework/context.h>
+#include <services/symbols.h>
/* Value represents result of expression evaluation */
struct Value {
diff --git a/services/filesystem.c b/services/filesystem.c
index a8ebc2a1..6476a45c 100644
--- a/services/filesystem.c
+++ b/services/filesystem.c
@@ -16,7 +16,7 @@
* Target service implementation: file system access (TCF name FileSystem)
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_FileSystem
@@ -31,16 +31,16 @@
# include <utime.h>
# include <dirent.h>
#endif
-#include "myalloc.h"
-#include "asyncreq.h"
-#include "streams.h"
-#include "channel.h"
-#include "link.h"
-#include "trace.h"
-#include "json.h"
-#include "exceptions.h"
-#include "protocol.h"
-#include "filesystem.h"
+#include <framework/myalloc.h>
+#include <framework/asyncreq.h>
+#include <framework/streams.h>
+#include <framework/channel.h>
+#include <framework/link.h>
+#include <framework/trace.h>
+#include <framework/json.h>
+#include <framework/exceptions.h>
+#include <framework/protocol.h>
+#include <services/filesystem.h>
#define BUF_SIZE 0x1000
diff --git a/services/filesystem.h b/services/filesystem.h
index 239be92d..1a1cb416 100644
--- a/services/filesystem.h
+++ b/services/filesystem.h
@@ -19,7 +19,7 @@
#ifndef D_filesystem
#define D_filesystem
-#include "protocol.h"
+#include <framework/protocol.h>
/*
* Initialize file system service.
*/
diff --git a/services/linenumbers.c b/services/linenumbers.c
index 73676ceb..91e1c229 100644
--- a/services/linenumbers.c
+++ b/services/linenumbers.c
@@ -19,22 +19,21 @@
* machine instruction addresses in the executable object.
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_LineNumbers
#include <errno.h>
#include <assert.h>
#include <stdio.h>
-#include "linenumbers.h"
-#include "context.h"
-#include "myalloc.h"
-#include "exceptions.h"
-#include "cache.h"
-#include "json.h"
-#include "protocol.h"
-#include "stacktrace.h"
-#include "trace.h"
+#include <framework/context.h>
+#include <framework/myalloc.h>
+#include <framework/exceptions.h>
+#include <framework/cache.h>
+#include <framework/json.h>
+#include <framework/protocol.h>
+#include <framework/trace.h>
+#include <services/linenumbers.h>
typedef struct MapToSourceArgs {
char token[256];
diff --git a/services/linenumbers.h b/services/linenumbers.h
index 99aef532..8e07a978 100644
--- a/services/linenumbers.h
+++ b/services/linenumbers.h
@@ -21,8 +21,8 @@
#ifndef D_linenumbers
#define D_linenumbers
-#include "protocol.h"
-#include "context.h"
+#include <framework/protocol.h>
+#include <framework/context.h>
typedef struct CodeArea {
char * directory;
diff --git a/services/linenumbers_elf.c b/services/linenumbers_elf.c
index 3ab0e390..1820b392 100644
--- a/services/linenumbers_elf.c
+++ b/services/linenumbers_elf.c
@@ -19,26 +19,26 @@
* machine instruction addresses in the executable object.
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_LineNumbers && !ENABLE_LineNumbersProxy && ENABLE_ELF
#include <errno.h>
#include <assert.h>
#include <stdio.h>
-#include "linenumbers.h"
-#include "context.h"
-#include "myalloc.h"
-#include "exceptions.h"
-#include "cache.h"
-#include "json.h"
-#include "protocol.h"
-#include "tcf_elf.h"
-#include "dwarfio.h"
-#include "dwarf.h"
-#include "dwarfcache.h"
-#include "stacktrace.h"
-#include "trace.h"
+#include <framework/context.h>
+#include <framework/myalloc.h>
+#include <framework/exceptions.h>
+#include <framework/cache.h>
+#include <framework/trace.h>
+#include <framework/json.h>
+#include <framework/protocol.h>
+#include <services/linenumbers.h>
+#include <services/tcf_elf.h>
+#include <services/dwarfio.h>
+#include <services/dwarf.h>
+#include <services/dwarfcache.h>
+#include <services/stacktrace.h>
static CompUnit * find_unit(Context * ctx, DWARFCache * cache, ContextAddress addr0, ContextAddress addr1, ContextAddress * addr_next) {
U4_T i;
diff --git a/services/linenumbers_proxy.c b/services/linenumbers_proxy.c
index cc39caca..1d6fd448 100644
--- a/services/linenumbers_proxy.c
+++ b/services/linenumbers_proxy.c
@@ -19,19 +19,19 @@
* machine instruction addresses in the executable object.
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_LineNumbersProxy
#include <assert.h>
#include <stdio.h>
-#include "context.h"
-#include "cache.h"
-#include "json.h"
-#include "events.h"
-#include "myalloc.h"
-#include "exceptions.h"
-#include "linenumbers.h"
+#include <framework/context.h>
+#include <framework/cache.h>
+#include <framework/json.h>
+#include <framework/events.h>
+#include <framework/myalloc.h>
+#include <framework/exceptions.h>
+#include <services/linenumbers.h>
#define HASH_SIZE 511
diff --git a/services/linenumbers_win32.c b/services/linenumbers_win32.c
index a14c4237..500e89f6 100644
--- a/services/linenumbers_win32.c
+++ b/services/linenumbers_win32.c
@@ -18,22 +18,20 @@
* machine instruction addresses in the executable object.
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_LineNumbers && !ENABLE_LineNumbersProxy && defined(_MSC_VER) && !ENABLE_ELF
#include <errno.h>
#include <assert.h>
#include <stdio.h>
-#include "linenumbers.h"
-#include "breakpoints.h"
-#include "windbgcache.h"
-#include "context-win32.h"
-#include "context.h"
-#include "exceptions.h"
-#include "symbols.h"
-#include "json.h"
-#include "protocol.h"
+#include <framework/json.h>
+#include <framework/protocol.h>
+#include <framework/context.h>
+#include <framework/exceptions.h>
+#include <services/linenumbers.h>
+#include <system/Windows/windbgcache.h>
+#include <system/Windows/context-win32.h>
int line_to_address(Context * ctx, char * file, int line, int column, LineNumbersCallBack * callback, void * user_args) {
int err = 0;
diff --git a/services/memorymap.c b/services/memorymap.c
index 8b011f35..dd505ca9 100644
--- a/services/memorymap.c
+++ b/services/memorymap.c
@@ -16,7 +16,7 @@
* This module holds execution context memory maps.
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_MemoryMap
@@ -29,11 +29,11 @@
#if defined(_WRS_KERNEL)
# include <moduleLib.h>
#endif
-#include "memorymap.h"
-#include "myalloc.h"
-#include "json.h"
-#include "events.h"
-#include "exceptions.h"
+#include <framework/myalloc.h>
+#include <framework/json.h>
+#include <framework/events.h>
+#include <framework/exceptions.h>
+#include <services/memorymap.h>
typedef struct MemoryMap {
int valid;
diff --git a/services/memorymap.h b/services/memorymap.h
index e924b71d..b024d627 100644
--- a/services/memorymap.h
+++ b/services/memorymap.h
@@ -18,9 +18,9 @@
#ifndef D_memorymap
#define D_memorymap
-#include "config.h"
-#include "context.h"
-#include "protocol.h"
+#include <config.h>
+#include <framework/context.h>
+#include <framework/protocol.h>
typedef struct MemoryRegion MemoryRegion;
diff --git a/services/memoryservice.c b/services/memoryservice.c
index 4b9904e9..257193d3 100644
--- a/services/memoryservice.c
+++ b/services/memoryservice.c
@@ -16,21 +16,20 @@
* TCF Memory - memory access service.
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_Memory
#include <assert.h>
-#include "protocol.h"
-#include "context.h"
-#include "json.h"
-#include "exceptions.h"
-#include "memoryservice.h"
-#include "breakpoints.h"
-#include "runctrl.h"
-#include "myalloc.h"
-#include "channel.h"
-#include "trace.h"
+#include <framework/protocol.h>
+#include <framework/context.h>
+#include <framework/json.h>
+#include <framework/exceptions.h>
+#include <framework/myalloc.h>
+#include <framework/channel.h>
+#include <framework/trace.h>
+#include <services/memoryservice.h>
+#include <services/runctrl.h>
static const char * MEMORY = "Memory";
diff --git a/services/pathmap.c b/services/pathmap.c
index 0d5d8200..a9068f6c 100644
--- a/services/pathmap.c
+++ b/services/pathmap.c
@@ -17,16 +17,16 @@
* The service manages file path mapping rules.
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_PathMap
#include <stdio.h>
-#include "json.h"
-#include "events.h"
-#include "exceptions.h"
-#include "myalloc.h"
-#include "pathmap.h"
+#include <framework/json.h>
+#include <framework/events.h>
+#include <framework/exceptions.h>
+#include <framework/myalloc.h>
+#include <services/pathmap.h>
typedef struct PathMapRuleAttr {
char * name;
diff --git a/services/pathmap.h b/services/pathmap.h
index aaad9c17..ca8ee8e1 100644
--- a/services/pathmap.h
+++ b/services/pathmap.h
@@ -20,8 +20,8 @@
#ifndef D_pathmap
#define D_pathmap
-#include "config.h"
-#include "protocol.h"
+#include <config.h>
+#include <framework/protocol.h>
/*
* Translate debug file name to local name using file path mapping table of given channel.
diff --git a/services/processes.c b/services/processes.c
index 74d28e4c..e4c77afc 100644
--- a/services/processes.c
+++ b/services/processes.c
@@ -20,7 +20,7 @@
* require a process to be attached before they can access it.
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_Processes
@@ -31,29 +31,27 @@
#include <fcntl.h>
#include <signal.h>
#include <assert.h>
-#include "myalloc.h"
-#include "protocol.h"
-#include "trace.h"
-#include "context.h"
-#include "json.h"
-#include "asyncreq.h"
-#include "exceptions.h"
-#include "runctrl.h"
-#include "filesystem.h"
-#include "streamsservice.h"
-#include "waitpid.h"
-#include "signames.h"
-#include "processes.h"
+#include <framework/myalloc.h>
+#include <framework/protocol.h>
+#include <framework/trace.h>
+#include <framework/context.h>
+#include <framework/json.h>
+#include <framework/asyncreq.h>
+#include <framework/exceptions.h>
+#include <framework/waitpid.h>
+#include <framework/signames.h>
+#include <services/streamsservice.h>
+#include <services/processes.h>
static const char * PROCESSES = "Processes";
#if defined(WIN32)
-# include "tlhelp32.h"
+# include <tlhelp32.h>
# ifdef _MSC_VER
# pragma warning(disable:4201) /* nonstandard extension used : nameless struct/union (in winternl.h) */
-# include "winternl.h"
+# include <winternl.h>
# else
-# include "ntdef.h"
+# include <ntdef.h>
# endif
# ifndef STATUS_INFO_LENGTH_MISMATCH
# define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS)0xC0000004L)
diff --git a/services/processes.h b/services/processes.h
index ace94ff2..f95c27a7 100644
--- a/services/processes.h
+++ b/services/processes.h
@@ -23,7 +23,7 @@
#ifndef D_processes
#define D_processes
-#include "protocol.h"
+#include <framework/protocol.h>
/*
* Initialize process control service.
diff --git a/services/registers.c b/services/registers.c
index 0b7c2d34..d5abc2cd 100644
--- a/services/registers.c
+++ b/services/registers.c
@@ -16,7 +16,7 @@
* TCF Registers - CPU registers access service.
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_Registers
@@ -24,14 +24,14 @@
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
-#include "myalloc.h"
-#include "protocol.h"
-#include "context.h"
-#include "json.h"
-#include "cache.h"
-#include "exceptions.h"
-#include "stacktrace.h"
-#include "registers.h"
+#include <framework/myalloc.h>
+#include <framework/protocol.h>
+#include <framework/context.h>
+#include <framework/json.h>
+#include <framework/cache.h>
+#include <framework/exceptions.h>
+#include <services/stacktrace.h>
+#include <services/registers.h>
static const char * REGISTERS = "Registers";
diff --git a/services/registers.h b/services/registers.h
index 6f167989..36c2df3e 100644
--- a/services/registers.h
+++ b/services/registers.h
@@ -19,7 +19,7 @@
#ifndef D_registers
#define D_registers
-#include "protocol.h"
+#include <framework/protocol.h>
/*
* Initialize registers service.
diff --git a/services/runctrl.c b/services/runctrl.c
index db31ceac..3f2a8afd 100644
--- a/services/runctrl.c
+++ b/services/runctrl.c
@@ -16,7 +16,7 @@
* Target service implementation: run control (TCF name RunControl)
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_RunControl
@@ -25,18 +25,18 @@
#include <signal.h>
#include <errno.h>
#include <assert.h>
-#include "runctrl.h"
-#include "protocol.h"
-#include "channel.h"
-#include "json.h"
-#include "context.h"
-#include "myalloc.h"
-#include "trace.h"
-#include "events.h"
-#include "exceptions.h"
-#include "breakpoints.h"
-#include "signames.h"
-#include "cmdline.h"
+#include <framework/protocol.h>
+#include <framework/channel.h>
+#include <framework/json.h>
+#include <framework/context.h>
+#include <framework/myalloc.h>
+#include <framework/trace.h>
+#include <framework/events.h>
+#include <framework/exceptions.h>
+#include <framework/signames.h>
+#include <services/runctrl.h>
+#include <services/breakpoints.h>
+#include <main/cmdline.h>
#define RM_RESUME 0
#define RM_STEP_OVER 1
@@ -940,7 +940,7 @@ void ini_run_ctrl_service(Protocol * proto, TCFBroadcastGroup * bcg) {
#else
-#include "runctrl.h"
+#include <services/runctrl.h>
#include <assert.h>
void post_safe_event(Context * mem, EventCallBack * done, void * arg) {
diff --git a/services/runctrl.h b/services/runctrl.h
index d59ed156..592843c5 100644
--- a/services/runctrl.h
+++ b/services/runctrl.h
@@ -19,10 +19,10 @@
#ifndef D_runctrl
#define D_runctrl
-#include "config.h"
-#include "events.h"
-#include "context.h"
-#include "protocol.h"
+#include <config.h>
+#include <framework/events.h>
+#include <framework/context.h>
+#include <framework/protocol.h>
/*
* Lock run control: don't resume any thread while run control is locked.
diff --git a/services/stacktrace.c b/services/stacktrace.c
index e4b5adbb..7b8bb952 100644
--- a/services/stacktrace.c
+++ b/services/stacktrace.c
@@ -16,7 +16,7 @@
* Target service implementation: stack trace (TCF name StackTrace)
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_StackTrace
@@ -25,17 +25,15 @@
#include <stdio.h>
#include <string.h>
#include <assert.h>
-#include "myalloc.h"
-#include "protocol.h"
-#include "trace.h"
-#include "context.h"
-#include "json.h"
-#include "cache.h"
-#include "exceptions.h"
-#include "stacktrace.h"
-#include "breakpoints.h"
-#include "memorymap.h"
-#include "symbols.h"
+#include <framework/myalloc.h>
+#include <framework/protocol.h>
+#include <framework/trace.h>
+#include <framework/context.h>
+#include <framework/json.h>
+#include <framework/cache.h>
+#include <framework/exceptions.h>
+#include <services/stacktrace.h>
+#include <services/symbols.h>
#define MAX_FRAMES 1000
diff --git a/services/stacktrace.h b/services/stacktrace.h
index 1ab928a5..9e6c2fd6 100644
--- a/services/stacktrace.h
+++ b/services/stacktrace.h
@@ -19,8 +19,8 @@
#ifndef D_stacktrace
#define D_stacktrace
-#include "protocol.h"
-#include "context.h"
+#include <framework/protocol.h>
+#include <framework/context.h>
#if SERVICE_StackTrace || ENABLE_ContextProxy
diff --git a/services/streamsservice.c b/services/streamsservice.c
index c9c96cff..e47e5b73 100644
--- a/services/streamsservice.c
+++ b/services/streamsservice.c
@@ -16,19 +16,19 @@
* TCF Streams - generic streams service.
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_Streams
#include <assert.h>
-#include "streamsservice.h"
-#include "channel.h"
-#include "exceptions.h"
-#include "json.h"
-#include "errors.h"
-#include "trace.h"
-#include "events.h"
-#include "myalloc.h"
+#include <framework/channel.h>
+#include <framework/exceptions.h>
+#include <framework/json.h>
+#include <framework/errors.h>
+#include <framework/trace.h>
+#include <framework/events.h>
+#include <framework/myalloc.h>
+#include <services/streamsservice.h>
static const char * STREAMS = "Streams";
diff --git a/services/streamsservice.h b/services/streamsservice.h
index 156df3bf..d7bc721e 100644
--- a/services/streamsservice.h
+++ b/services/streamsservice.h
@@ -19,7 +19,7 @@
#ifndef D_streamsservice
#define D_streamsservice
-#include "protocol.h"
+#include <framework/protocol.h>
typedef struct VirtualStream VirtualStream;
diff --git a/services/symbols.c b/services/symbols.c
index ad6820db..8d15994a 100644
--- a/services/symbols.c
+++ b/services/symbols.c
@@ -13,17 +13,17 @@
*******************************************************************************/
-#include "config.h"
+#include <config.h>
#if SERVICE_Symbols
-#include "channel.h"
-#include "json.h"
-#include "myalloc.h"
-#include "exceptions.h"
-#include "stacktrace.h"
-#include "symbols.h"
-#include "cache.h"
+#include <framework/channel.h>
+#include <framework/json.h>
+#include <framework/myalloc.h>
+#include <framework/exceptions.h>
+#include <framework/cache.h>
+#include <services/stacktrace.h>
+#include <services/symbols.h>
static const char * SYMBOLS = "Symbols";
diff --git a/services/symbols.h b/services/symbols.h
index 7be9d848..071fb110 100644
--- a/services/symbols.h
+++ b/services/symbols.h
@@ -19,8 +19,8 @@
#ifndef D_symbols
#define D_symbols
-#include "context.h"
-#include "protocol.h"
+#include <framework/context.h>
+#include <framework/protocol.h>
/*
* Symbol information can change at any time as result of target background activities.
diff --git a/services/symbols_elf.c b/services/symbols_elf.c
index 8a9caaf3..c4e9a644 100644
--- a/services/symbols_elf.c
+++ b/services/symbols_elf.c
@@ -16,7 +16,7 @@
* Symbols service - ELF version.
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_Symbols && !ENABLE_SymbolsProxy && ENABLE_ELF
@@ -29,19 +29,19 @@
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
-#include "errors.h"
-#include "tcf_elf.h"
-#include "dwarf.h"
-#include "myalloc.h"
-#include "events.h"
-#include "exceptions.h"
-#include "dwarfcache.h"
-#include "dwarfexpr.h"
-#include "dwarfframe.h"
-#include "stacktrace.h"
-#include "symbols.h"
+#include <framework/errors.h>
+#include <framework/myalloc.h>
+#include <framework/events.h>
+#include <framework/exceptions.h>
+#include <services/tcf_elf.h>
+#include <services/dwarf.h>
+#include <services/dwarfcache.h>
+#include <services/dwarfexpr.h>
+#include <services/dwarfframe.h>
+#include <services/stacktrace.h>
+#include <services/symbols.h>
#if ENABLE_RCBP_TEST
-# include "test.h"
+# include <main/test.h>
#endif
struct Symbol {
@@ -58,7 +58,7 @@ struct Symbol {
Symbol * base;
};
-#include "symbols_alloc.h"
+#include <services/symbols_alloc.h>
static Context * sym_ctx;
static int sym_frame;
diff --git a/services/symbols_proxy.c b/services/symbols_proxy.c
index 0212fdf2..d4742fe6 100644
--- a/services/symbols_proxy.c
+++ b/services/symbols_proxy.c
@@ -18,22 +18,22 @@
/* TODO: need to cleanup symbols cache from data that not used for long time */
-#include "config.h"
+#include <config.h>
#if ENABLE_SymbolsProxy
#include <assert.h>
#include <stdio.h>
-#include "context.h"
-#include "cache.h"
-#include "json.h"
-#include "events.h"
-#include "myalloc.h"
-#include "exceptions.h"
-#include "stacktrace.h"
-#include "symbols.h"
+#include <framework/context.h>
+#include <framework/cache.h>
+#include <framework/json.h>
+#include <framework/events.h>
+#include <framework/myalloc.h>
+#include <framework/exceptions.h>
+#include <services/stacktrace.h>
+#include <services/symbols.h>
#if ENABLE_RCBP_TEST
-# include "test.h"
+# include <main/test.h>
#endif
#define HASH_SIZE 101
@@ -160,7 +160,7 @@ struct Symbol {
SymInfoCache * cache;
};
-#include "symbols_alloc.h"
+#include <services/symbols_alloc.h>
static LINK root;
diff --git a/services/symbols_win32.c b/services/symbols_win32.c
index 066cd6c9..996b7412 100644
--- a/services/symbols_win32.c
+++ b/services/symbols_win32.c
@@ -16,7 +16,7 @@
* Symbols service - Windows version
*/
-#include "config.h"
+#include <config.h>
#if SERVICE_Symbols && !ENABLE_SymbolsProxy && defined(_MSC_VER) && !ENABLE_ELF
@@ -25,17 +25,16 @@
#include <stdlib.h>
#include <stdio.h>
#include <wchar.h>
-#include "errors.h"
-#include "events.h"
-#include "tcf_elf.h"
-#include "myalloc.h"
-#include "symbols.h"
-#include "stacktrace.h"
-#include "windbgcache.h"
-#include "context-win32.h"
-#include "trace.h"
+#include <framework/errors.h>
+#include <framework/events.h>
+#include <framework/myalloc.h>
+#include <framework/trace.h>
+#include <services/symbols.h>
+#include <services/stacktrace.h>
+#include <system/Windows/windbgcache.h>
+#include <system/Windows/context-win32.h>
#if ENABLE_RCBP_TEST
-# include "test.h"
+# include <main/test.h>
#endif
#define SYM_SEARCH_PATH ""
@@ -103,7 +102,7 @@ struct Symbol {
void * address;
};
-#include "symbols_alloc.h"
+#include <services/symbols_alloc.h>
typedef struct SymbolCacheEntry {
HANDLE process;
diff --git a/services/sysmon.c b/services/sysmon.c
index d6a818c6..af706712 100644
--- a/services/sysmon.c
+++ b/services/sysmon.c
@@ -12,7 +12,7 @@
* Wind River Systems - initial API and implementation
*******************************************************************************/
-#include "config.h"
+#include <config.h>
#if SERVICE_SysMonitor
@@ -23,13 +23,13 @@
#include <assert.h>
#include <fcntl.h>
#include <sys/stat.h>
-#include "sysmon.h"
-#include "protocol.h"
-#include "exceptions.h"
-#include "myalloc.h"
-#include "json.h"
-#include "context.h"
-#include "errors.h"
+#include <framework/protocol.h>
+#include <framework/exceptions.h>
+#include <framework/myalloc.h>
+#include <framework/json.h>
+#include <framework/context.h>
+#include <framework/errors.h>
+#include <services/sysmon.h>
static const char SYS_MON[] = "SysMonitor";
diff --git a/services/sysmon.h b/services/sysmon.h
index 20732caa..606bbd92 100644
--- a/services/sysmon.h
+++ b/services/sysmon.h
@@ -19,7 +19,7 @@
#ifndef D_sysmon
#define D_sysmon
-#include "protocol.h"
+#include <framework/protocol.h>
/*
* Initialize system monitor service.
diff --git a/services/tcf_elf.c b/services/tcf_elf.c
index 892b3180..208ad9ac 100644
--- a/services/tcf_elf.c
+++ b/services/tcf_elf.c
@@ -16,7 +16,7 @@
* This module implements reading and caching of ELF files.
*/
-#include "config.h"
+#include <config.h>
#if ENABLE_ELF
@@ -27,12 +27,12 @@
#include <fcntl.h>
#include <errno.h>
#include <stdio.h>
-#include "tcf_elf.h"
-#include "myalloc.h"
-#include "exceptions.h"
-#include "memorymap.h"
-#include "events.h"
-#include "trace.h"
+#include <services/tcf_elf.h>
+#include <framework/myalloc.h>
+#include <framework/exceptions.h>
+#include <services/memorymap.h>
+#include <framework/events.h>
+#include <framework/trace.h>
#if defined(_WRS_KERNEL)
#elif defined(WIN32)
diff --git a/services/tcf_elf.h b/services/tcf_elf.h
index 8a585027..5819ab91 100644
--- a/services/tcf_elf.h
+++ b/services/tcf_elf.h
@@ -18,14 +18,14 @@
#ifndef D_elf
#define D_elf
-#include "config.h"
+#include <config.h>
#if ENABLE_ELF
#if !defined(WIN32) && !defined(__APPLE__)
# include <elf.h>
#endif
-#include "context.h"
+#include <framework/context.h>
#if defined(WIN32) || defined(__APPLE__)
diff --git a/system/Cygwin/context-cygwin.c b/system/Cygwin/context-cygwin.c
index 0ea1da36..dfc608c4 100644
--- a/system/Cygwin/context-cygwin.c
+++ b/system/Cygwin/context-cygwin.c
@@ -16,4 +16,4 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include "system/Windows/context-win32.c"
+#include <system/Windows/context-win32.c>
diff --git a/system/Darwin/context-darwin.c b/system/Darwin/context-darwin.c
index dbe8a91f..7ee06f01 100644
--- a/system/Darwin/context-darwin.c
+++ b/system/Darwin/context-darwin.c
@@ -16,7 +16,7 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include "config.h"
+#include <config.h>
#if defined(__APPLE__)
@@ -26,19 +26,19 @@
#include <assert.h>
#include <errno.h>
#include <signal.h>
+#include <sched.h>
#include <sys/syscall.h>
#include <sys/ptrace.h>
-#include <sched.h>
#include <mach/thread_status.h>
-#include "context.h"
-#include "regset.h"
-#include "events.h"
-#include "errors.h"
-#include "trace.h"
-#include "myalloc.h"
-#include "breakpoints.h"
-#include "waitpid.h"
-#include "signames.h"
+#include <framework/context.h>
+#include <framework/events.h>
+#include <framework/errors.h>
+#include <framework/trace.h>
+#include <framework/myalloc.h>
+#include <framework/waitpid.h>
+#include <framework/signames.h>
+#include <services/breakpoints.h>
+#include <system/Darwin/regset.h>
#define WORD_SIZE 4
@@ -63,7 +63,7 @@ static size_t context_extension_offset = 0;
#define EXT(ctx) ((ContextExtensionDarwin *)((char *)(ctx) + context_extension_offset))
-#include "system/pid-hash.h"
+#include <system/pid-hash.h>
static LINK pending_list;
diff --git a/system/FreeBSD/context-freebsd.c b/system/FreeBSD/context-freebsd.c
index 03677114..4780eb34 100644
--- a/system/FreeBSD/context-freebsd.c
+++ b/system/FreeBSD/context-freebsd.c
@@ -16,7 +16,7 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include "config.h"
+#include <config.h>
#if defined(__FreeBSD__)
@@ -26,17 +26,17 @@
#include <assert.h>
#include <errno.h>
#include <signal.h>
-#include <sys/ptrace.h>
#include <sched.h>
-#include "context.h"
-#include "regset.h"
-#include "events.h"
-#include "errors.h"
-#include "trace.h"
-#include "myalloc.h"
-#include "breakpoints.h"
-#include "waitpid.h"
-#include "signames.h"
+#include <sys/ptrace.h>
+#include <framework/context.h>
+#include <framework/events.h>
+#include <framework/errors.h>
+#include <framework/trace.h>
+#include <framework/myalloc.h>
+#include <framework/waitpid.h>
+#include <framework/signames.h>
+#include <services/breakpoints.h>
+#include <system/FreeBSD/regset.h>
#define PTRACE_TRACEME PT_TRACE_ME
#define PTRACE_ATTACH PT_ATTACH
@@ -71,7 +71,7 @@ static size_t context_extension_offset = 0;
#define EXT(ctx) ((ContextExtensionBSD *)((char *)(ctx) + context_extension_offset))
-#include "system/pid-hash.h"
+#include <system/pid-hash.h>
static LINK pending_list;
diff --git a/system/GNU/Linux/context-linux.c b/system/GNU/Linux/context-linux.c
index 4a4f9e85..1186d4ce 100644
--- a/system/GNU/Linux/context-linux.c
+++ b/system/GNU/Linux/context-linux.c
@@ -16,7 +16,7 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include "config.h"
+#include <config.h>
#if defined(__linux__)
@@ -26,21 +26,21 @@
#include <assert.h>
#include <errno.h>
#include <signal.h>
+#include <sched.h>
#include <asm/unistd.h>
#include <sys/ptrace.h>
-#include <sched.h>
-#include "context.h"
-#include "regset.h"
-#include "events.h"
-#include "errors.h"
-#include "trace.h"
-#include "myalloc.h"
-#include "breakpoints.h"
-#include "expressions.h"
-#include "memorymap.h"
-#include "waitpid.h"
-#include "tcf_elf.h"
-#include "signames.h"
+#include <framework/context.h>
+#include <framework/events.h>
+#include <framework/errors.h>
+#include <framework/trace.h>
+#include <framework/myalloc.h>
+#include <framework/waitpid.h>
+#include <framework/signames.h>
+#include <services/breakpoints.h>
+#include <services/expressions.h>
+#include <services/memorymap.h>
+#include <services/tcf_elf.h>
+#include <system/GNU/Linux/regset.h>
#if !defined(PTRACE_SETOPTIONS)
#define PTRACE_SETOPTIONS 0x4200
@@ -101,7 +101,7 @@ static size_t context_extension_offset = 0;
#define EXT(ctx) ((ContextExtensionLinux *)((char *)(ctx) + context_extension_offset))
-#include "system/pid-hash.h"
+#include <system/pid-hash.h>
static LINK pending_list;
diff --git a/system/Msys/context-msys.c b/system/Msys/context-msys.c
index 0ea1da36..dfc608c4 100644
--- a/system/Msys/context-msys.c
+++ b/system/Msys/context-msys.c
@@ -16,4 +16,4 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include "system/Windows/context-win32.c"
+#include <system/Windows/context-win32.c>
diff --git a/system/VxWorks/context-vxworks.c b/system/VxWorks/context-vxworks.c
index 67ac498d..798fa392 100644
--- a/system/VxWorks/context-vxworks.c
+++ b/system/VxWorks/context-vxworks.c
@@ -16,7 +16,7 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include "config.h"
+#include <config.h>
#if defined(_WRS_KERNEL)
@@ -26,14 +26,14 @@
#include <assert.h>
#include <errno.h>
#include <signal.h>
-#include "context-vxworks.h"
-#include "events.h"
-#include "errors.h"
-#include "trace.h"
-#include "myalloc.h"
-#include "breakpoints.h"
-#include "waitpid.h"
-#include "signames.h"
+#include <framework/events.h>
+#include <framework/errors.h>
+#include <framework/trace.h>
+#include <framework/myalloc.h>
+#include <framework/waitpid.h>
+#include <framework/signames.h>
+#include <services/breakpoints.h>
+#include <system/VxWorks/context-vxworks.h>
/* TODO: VxWorks RTP support */
@@ -56,7 +56,7 @@ static size_t context_extension_offset = 0;
#define EXT(ctx) ((ContextExtensionVxWorks *)((char *)(ctx) + context_extension_offset))
-#include "system/pid-hash.h"
+#include <system/pid-hash.h>
#define EVENT_HOOK_BREAKPOINT 2
#define EVENT_HOOK_STEP_DONE 3
diff --git a/system/VxWorks/context-vxworks.h b/system/VxWorks/context-vxworks.h
index 77a3ed4e..fe4ad8cc 100644
--- a/system/VxWorks/context-vxworks.h
+++ b/system/VxWorks/context-vxworks.h
@@ -19,8 +19,8 @@
#ifndef D_context_vxworks
#define D_context_vxworks
-#include "config.h"
-#include "context.h"
+#include <config.h>
+#include <framework/context.h>
extern VXDBG_CLNT_ID vxdbg_clnt_id;
diff --git a/system/Windows/context-win32.c b/system/Windows/context-win32.c
index c0b50db4..d57f29cc 100644
--- a/system/Windows/context-win32.c
+++ b/system/Windows/context-win32.c
@@ -16,7 +16,7 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include "config.h"
+#include <config.h>
#if defined(WIN32)
@@ -26,16 +26,16 @@
#include <assert.h>
#include <errno.h>
#include <signal.h>
-#include "context.h"
-#include "events.h"
-#include "errors.h"
-#include "trace.h"
-#include "myalloc.h"
-#include "breakpoints.h"
-#include "waitpid.h"
-#include "regset.h"
-#include "signames.h"
-#include "context-win32.h"
+#include <framework/context.h>
+#include <framework/events.h>
+#include <framework/errors.h>
+#include <framework/trace.h>
+#include <framework/myalloc.h>
+#include <framework/waitpid.h>
+#include <framework/signames.h>
+#include <services/breakpoints.h>
+#include <system/Windows/context-win32.h>
+#include <system/Windows/regset.h>
typedef struct ContextExtensionWin32 {
pid_t pid;
@@ -79,7 +79,7 @@ typedef struct DebugEvent {
struct DebugEvent * next;
} DebugEvent;
-#include "system/pid-hash.h"
+#include <system/pid-hash.h>
#define EXCEPTION_DEBUGGER_IO 0x406D1388
diff --git a/system/Windows/context-win32.h b/system/Windows/context-win32.h
index 2fa3de4f..e2e8cc92 100644
--- a/system/Windows/context-win32.h
+++ b/system/Windows/context-win32.h
@@ -19,8 +19,8 @@
#ifndef D_context_win32
#define D_context_win32
-#include "config.h"
-#include "context.h"
+#include <config.h>
+#include <framework/context.h>
extern HANDLE get_context_handle(Context * ctx);
extern HANDLE get_context_file_handle(Context * ctx);
diff --git a/system/Windows/windbgcache.c b/system/Windows/windbgcache.c
index a4533bf6..980f3d32 100644
--- a/system/Windows/windbgcache.c
+++ b/system/Windows/windbgcache.c
@@ -17,14 +17,14 @@
* Current implementation delegates all its job to DBGHELP.DLL.
*/
-#include "config.h"
+#include <config.h>
#if defined(WIN32) && !ENABLE_ELF
#include <assert.h>
#include <stdio.h>
#include <wchar.h>
-#include "windbgcache.h"
+#include <system/Windows/windbgcache.h>
static HINSTANCE dbghelp_dll = NULL;
diff --git a/system/Windows/windbgcache.h b/system/Windows/windbgcache.h
index 95c7ac12..d1a170ff 100644
--- a/system/Windows/windbgcache.h
+++ b/system/Windows/windbgcache.h
@@ -23,7 +23,7 @@ extern "C" {
#ifndef D_windbgcache
#define D_windbgcache
-#include "config.h"
+#include <config.h>
#if defined(WIN32)

Back to the top