[PATCH 05/50] Make includes paths consistent


Michael Schonberg <mschonberg@...>
 

From: Mike Schonberg <mschonberg@nyx.com>

wConfig.h and port.h should be included as wombat/xxx.h. This simplifies the
builds and makes the consistent across Windows and Linux.

Signed-off-by: Mike Schonberg <mschonberg@nyx.com>
---
common/c_cpp/src/c/windows/machine_win.c | 2 +-
common/c_cpp/src/c/windows/platform.c | 2 +-
common/c_cpp/src/c/windows/port.h | 7 ++++---
common/c_cpp/src/c/windows/wSemaphore.c | 2 +-
common/c_cpp/src/c/wombat/environment.h | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/c_cpp/src/c/windows/machine_win.c b/common/c_cpp/src/c/windows/machine_win.c
index f6f3ad5..3fce1cd 100644
--- a/common/c_cpp/src/c/windows/machine_win.c
+++ b/common/c_cpp/src/c/windows/machine_win.c
@@ -18,7 +18,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/common/c_cpp/src/c/windows/platform.c b/common/c_cpp/src/c/windows/platform.c
index f17e1f9..8b89525 100644
--- a/common/c_cpp/src/c/windows/platform.c
+++ b/common/c_cpp/src/c/windows/platform.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include "port.h"
+#include "wombat/port.h"
#include "platform.h"

#define PATH_SEPERATOR "\\"
diff --git a/common/c_cpp/src/c/windows/port.h b/common/c_cpp/src/c/windows/port.h
index df06b4f..ded944a 100644
--- a/common/c_cpp/src/c/windows/port.h
+++ b/common/c_cpp/src/c/windows/port.h
@@ -37,9 +37,10 @@
#include <tlhelp32.h>
#include <time.h>

-#include "wConfig.h"
-#include "lock.h"
-#include "mmap.h"
+#include "wombat/targetsxs.h"
+#include "wombat/wConfig.h"
+#include "windows/lock.h"
+#include "windows/mmap.h"

#if defined(__cplusplus)
extern "C" {
diff --git a/common/c_cpp/src/c/windows/wSemaphore.c b/common/c_cpp/src/c/windows/wSemaphore.c
index 6947ac4..f3dd8a6 100644
--- a/common/c_cpp/src/c/windows/wSemaphore.c
+++ b/common/c_cpp/src/c/windows/wSemaphore.c
@@ -18,7 +18,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"

#include "wombat/wSemaphore.h"

diff --git a/common/c_cpp/src/c/wombat/environment.h b/common/c_cpp/src/c/wombat/environment.h
index 8acafe5..98c8974 100644
--- a/common/c_cpp/src/c/wombat/environment.h
+++ b/common/c_cpp/src/c/wombat/environment.h
@@ -22,7 +22,7 @@
#ifndef _WOMBAT_ENVIRONMENT_H
#define _WOMBAT_ENVIRONMENT_H

-#include "wConfig.h"
+#include "wombat/wConfig.h"

/**
* This function will delete an environment varible.
--
1.7.7.6