[PATCH 29/30] Moved port.h to wombat sub directory


Michael Schonberg <mschonberg@...>
 

Moved port.h to wombat subdirectory since it should be part of the distribution.
wConfig was als split with the windows shared object prefixes into the linux and
windows subdirectories.

Signed-off-by: Mike Schonberg <mschonberg@nyx.com>
---
common/c_cpp/configure.ac | 15 ++--
common/c_cpp/src/c/MRSWLock.c | 2 +-
common/c_cpp/src/c/Makefile.am | 2 +-
common/c_cpp/src/c/destroyHandle.c | 2 +-
common/c_cpp/src/c/linux/machine.c | 2 +-
common/c_cpp/src/c/linux/platform.c | 2 +-
common/c_cpp/src/c/linux/port.h | 2 +-
common/c_cpp/src/c/linux/wConfig.h | 40 ++++++++
common/c_cpp/src/c/linux/wSemaphore.c | 2 +-
common/c_cpp/src/c/list.c | 2 +-
common/c_cpp/src/c/machine.c | 2 +-
common/c_cpp/src/c/properties.l | 2 +-
common/c_cpp/src/c/property.c | 2 +-
common/c_cpp/src/c/queue.c | 2 +-
common/c_cpp/src/c/strutils.c | 2 +-
common/c_cpp/src/c/timers.c | 2 +-
common/c_cpp/src/c/timers.h | 2 +-
common/c_cpp/src/c/windows/wombat/wConfig.h | 101 ++++++++++++++++++++
common/c_cpp/src/c/wlock.c | 2 +-
common/c_cpp/src/c/wombat/wCommon.h | 2 +-
common/c_cpp/src/c/wombat/wConfig.h | 31 +------
common/c_cpp/src/c/wombat/wSemaphore.h | 2 +-
common/c_cpp/src/c/wombat/wincompat.h | 2 +-
mama/c_cpp/src/c/bridge/avis/bridge.c | 2 +-
mama/c_cpp/src/c/bridge/avis/msg.c | 2 +-
mama/c_cpp/src/c/bridge/avis/transportbridge.c | 2 +-
mama/c_cpp/src/c/conflation/connection.c | 2 +-
mama/c_cpp/src/c/conflation/connection_int.h | 2 +-
mama/c_cpp/src/c/conflation/manager.c | 2 +-
mama/c_cpp/src/c/conflation/manager_int.h | 2 +-
mama/c_cpp/src/c/conflation/serverconnection_int.h | 2 +-
mama/c_cpp/src/c/imagerequest.c | 2 +-
mama/c_cpp/src/c/imagerequest.h | 2 +-
mama/c_cpp/src/c/mama.c | 2 +-
mama/c_cpp/src/c/mama/conflation/manager.h | 2 +-
mama/c_cpp/src/c/mama/datetime.h | 2 +-
mama/c_cpp/src/c/mama/fielddesc.h | 2 +-
mama/c_cpp/src/c/mama/msg.h | 2 +-
mama/c_cpp/src/c/mama/msgfield.h | 2 +-
mama/c_cpp/src/c/mama/subscriptiontype.h | 2 +-
mama/c_cpp/src/c/mama/timezone.h | 2 +-
mama/c_cpp/src/c/mama/types.h | 2 +-
mama/c_cpp/src/c/msg.c | 2 +-
mama/c_cpp/src/c/payload/avismsg/avismsgimpl.c | 2 +-
mama/c_cpp/src/c/playback/playbackFileParser.h | 2 +-
mama/c_cpp/src/c/playback/playbackpublisher.h | 2 +-
mama/c_cpp/src/c/queue.c | 2 +-
mama/c_cpp/src/c/senderId.c | 2 +-
mama/c_cpp/src/c/stat.c | 2 +-
mama/c_cpp/src/c/timezone.c | 2 +-
mama/c_cpp/src/examples/c/mamainboxc.c | 2 +-
mama/c_cpp/src/examples/c/mamaio.c | 2 +-
mama/c_cpp/src/examples/c/mamalistenc.c | 2 +-
mama/c_cpp/src/examples/c/mamaproxyc.c | 2 +-
mama/c_cpp/src/examples/c/mamapublisherc.c | 2 +-
55 files changed, 201 insertions(+), 88 deletions(-)
create mode 100644 common/c_cpp/src/c/linux/wConfig.h
create mode 100644 common/c_cpp/src/c/windows/wombat/wConfig.h
mode change 100644 => 120000 common/c_cpp/src/c/wombat/wConfig.h

diff --git a/common/c_cpp/configure.ac b/common/c_cpp/configure.ac
index ab991b4..e288769 100755
--- a/common/c_cpp/configure.ac
+++ b/common/c_cpp/configure.ac
@@ -46,13 +46,14 @@ AC_CANONICAL_BUILD()
# Set up symbolic links for os-specific files
AC_MSG_NOTICE([Configuring symbolic links for $build_os in $srcdir])
case $build_os in
- linux*-*) AC_CONFIG_LINKS([src/c/port.h:src/c/linux/port.h
- src/c/wombat/wInterlocked.h:src/c/linux/wInterlocked.h
- src/c/machine_port.c:src/c/linux/machine.c
- src/c/platform.c:src/c/linux/platform.c
- src/c/wSemaphore.c:src/c/linux/wSemaphore.c
- src/c/network.c:src/c/linux/network.c
- src/c/environment.c:src/c/linux/environment.c]) ;;
+ linux*-*) AC_CONFIG_LINKS([$srcdir/src/c/wombat/port.h:src/c/linux/port.h
+ $srcdir/src/c/wombat/wConfig.h:src/c/linux/wConfig.h
+ $srcdir/src/c/wombat/wInterlocked.h:src/c/linux/wInterlocked.h
+ $srcdir/src/c/machine_port.c:src/c/linux/machine.c
+ $srcdir/src/c/platform.c:src/c/linux/platform.c
+ $srcdir/src/c/wSemaphore.c:src/c/linux/wSemaphore.c
+ $srcdir/src/c/network.c:src/c/linux/network.c
+ $srcdir/src/c/environment.c:src/c/linux/environment.c]) ;;
esac

# Checks for programs.
diff --git a/common/c_cpp/src/c/MRSWLock.c b/common/c_cpp/src/c/MRSWLock.c
index 8cccb7c..16131ee 100644
--- a/common/c_cpp/src/c/MRSWLock.c
+++ b/common/c_cpp/src/c/MRSWLock.c
@@ -22,7 +22,7 @@
/* ********************************************************** */
/* Includes. */
/* ********************************************************** */
-#include "port.h"
+#include "wombat/port.h"
#include "wombat/MRSWLock.h"
#include <stdlib.h>

diff --git a/common/c_cpp/src/c/Makefile.am b/common/c_cpp/src/c/Makefile.am
index 9258c21..9a42259 100644
--- a/common/c_cpp/src/c/Makefile.am
+++ b/common/c_cpp/src/c/Makefile.am
@@ -38,7 +38,7 @@ nobase_include_HEADERS = \
property.h \
wlock.h \
timers.h \
- port.h \
+ wombat/port.h \
wombat/MRSWLock.h \
wombat/environment.h \
wombat/machine.h \
diff --git a/common/c_cpp/src/c/destroyHandle.c b/common/c_cpp/src/c/destroyHandle.c
index cf63ea8..9a21b10 100644
--- a/common/c_cpp/src/c/destroyHandle.c
+++ b/common/c_cpp/src/c/destroyHandle.c
@@ -22,7 +22,7 @@
/* ************************************************************** */
/* Includes. */
/* ************************************************************** */
-#include "port.h"
+#include "wombat/port.h"
#include "destroyHandle.h"
#include <stdio.h>

diff --git a/common/c_cpp/src/c/linux/machine.c b/common/c_cpp/src/c/linux/machine.c
index 375734c..60fa0a1 100644
--- a/common/c_cpp/src/c/linux/machine.c
+++ b/common/c_cpp/src/c/linux/machine.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include <sys/stat.h>

#include <ctype.h>
diff --git a/common/c_cpp/src/c/linux/platform.c b/common/c_cpp/src/c/linux/platform.c
index 8bf7f4e..881ecde 100644
--- a/common/c_cpp/src/c/linux/platform.c
+++ b/common/c_cpp/src/c/linux/platform.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/common/c_cpp/src/c/linux/port.h b/common/c_cpp/src/c/linux/port.h
index 4e956c8..35877a1 100644
--- a/common/c_cpp/src/c/linux/port.h
+++ b/common/c_cpp/src/c/linux/port.h
@@ -179,7 +179,7 @@ struct wtimespec
long tv_nsec;
};

-#define wnanosleep (ts, remain) nanosleep(((struct timespec)(ts)),(remain))
+#define wnanosleep(ts, remain) nanosleep(((struct timespec*)(ts)),(remain))


/* net work utility functions */
diff --git a/common/c_cpp/src/c/linux/wConfig.h b/common/c_cpp/src/c/linux/wConfig.h
new file mode 100644
index 0000000..1d3d906
--- /dev/null
+++ b/common/c_cpp/src/c/linux/wConfig.h
@@ -0,0 +1,40 @@
+/* $Id: wConfig.h,v 1.1.2.1 2012/02/22 01:20:51 mikeschonberg Exp $
+ *
+ * OpenMAMA: The open middleware agnostic messaging API
+ * Copyright (C) 2011 NYSE Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef _WOMBAT_WCONFIG_H
+#define _WOMBAT_WCONFIG_H
+
+/* Call Types */
+#define COMMONExpDLL
+#define WMWExpDLL
+#define MAMAExpDLL
+#define MAMACPPExpDLL
+#define MAMDAExpDLL
+#define MAMDAOPTExpDLL
+#define MAMAExpBridgeDLL
+#define MAMACALLTYPE
+
+#define WCOMMONINLINE inline static
+#define WCOMMONFORCEINLINE inline static
+
+#endif /* _WOMBAT_WCONFIG_H */
+
+
diff --git a/common/c_cpp/src/c/linux/wSemaphore.c b/common/c_cpp/src/c/linux/wSemaphore.c
index 39327fb..7c29b4b 100644
--- a/common/c_cpp/src/c/linux/wSemaphore.c
+++ b/common/c_cpp/src/c/linux/wSemaphore.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

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

#include "wombat/wSemaphore.h"

diff --git a/common/c_cpp/src/c/list.c b/common/c_cpp/src/c/list.c
index ef3a00d..42f3072 100644
--- a/common/c_cpp/src/c/list.c
+++ b/common/c_cpp/src/c/list.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

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

#include <stdlib.h>
#include <stdio.h>
diff --git a/common/c_cpp/src/c/machine.c b/common/c_cpp/src/c/machine.c
index fc43143..38b602d 100644
--- a/common/c_cpp/src/c/machine.c
+++ b/common/c_cpp/src/c/machine.c
@@ -18,7 +18,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include <sys/stat.h>

#include <ctype.h>
diff --git a/common/c_cpp/src/c/properties.l b/common/c_cpp/src/c/properties.l
index 3c327e3..2a6f0a8 100644
--- a/common/c_cpp/src/c/properties.l
+++ b/common/c_cpp/src/c/properties.l
@@ -22,7 +22,7 @@
/** This file should be processed by FLEX or LEX **/

%{
-#include "port.h"
+#include "wombat/port.h"
#include "propertyinternal.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/common/c_cpp/src/c/property.c b/common/c_cpp/src/c/property.c
index a5271ec..77cac8e 100644
--- a/common/c_cpp/src/c/property.c
+++ b/common/c_cpp/src/c/property.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

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

#include <stdlib.h>
#include <stdio.h>
diff --git a/common/c_cpp/src/c/queue.c b/common/c_cpp/src/c/queue.c
index 6ae740b..1969d6a 100644
--- a/common/c_cpp/src/c/queue.c
+++ b/common/c_cpp/src/c/queue.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/common/c_cpp/src/c/strutils.c b/common/c_cpp/src/c/strutils.c
index 4874fe6..5410770 100644
--- a/common/c_cpp/src/c/strutils.c
+++ b/common/c_cpp/src/c/strutils.c
@@ -23,7 +23,7 @@
#define __STDC_FORMAT_MACROS
#endif

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

#include <stdio.h>
#include <string.h>
diff --git a/common/c_cpp/src/c/timers.c b/common/c_cpp/src/c/timers.c
index b5680c8..cb93ce8 100644
--- a/common/c_cpp/src/c/timers.c
+++ b/common/c_cpp/src/c/timers.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

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

#include <sys/types.h>
diff --git a/common/c_cpp/src/c/timers.h b/common/c_cpp/src/c/timers.h
index 4f4fb4d..22989f3 100644
--- a/common/c_cpp/src/c/timers.h
+++ b/common/c_cpp/src/c/timers.h
@@ -22,7 +22,7 @@
#ifndef TIMERS_INTERNAL_
#define TIMERS_INTERNAL_

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

typedef void* timerElement;
typedef void* timerHeap;
diff --git a/common/c_cpp/src/c/windows/wombat/wConfig.h b/common/c_cpp/src/c/windows/wombat/wConfig.h
new file mode 100644
index 0000000..2b944be
--- /dev/null
+++ b/common/c_cpp/src/c/windows/wombat/wConfig.h
@@ -0,0 +1,101 @@
+/* $Id: wConfig.h,v 1.1.2.1 2012/02/22 03:02:23 mikeschonberg Exp $
+ *
+ * OpenMAMA: The open middleware agnostic messaging API
+ * Copyright (C) 2011 NYSE Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef _WOMBAT_WCONFIG_H
+#define _WOMBAT_WCONFIG_H
+
+/* Calling conventions */
+#define MAMACALLTYPE __stdcall
+
+#if defined( COMMON_DLL )
+ /* We are building common dll */
+# define COMMONExpDLL __declspec( dllexport )
+#elif defined( MAMA_DLL ) && defined( MAMA )
+ /* We are building mama as a dll */
+# define COMMONExpDLL __declspec( dllimport )
+# define MAMAExpDLL __declspec( dllexport )
+# define MAMAExpBridgeDLL __declspec( dllexport )
+#elif defined( MAMA_DLL ) && defined( BRIDGE )
+ /* We are building mama bridge as a dll */
+# define MAMAExpDLL __declspec( dllimport )
+# define MAMAExpBridgeDLL __declspec( dllimport )
+# define COMMONExpDLL __declspec( dllimport )
+# define MAMACPPExpDLL
+# define MAMDAExpDLL
+# define MAMDAOPTExpDLL
+# define WMWExpDLL __declspec( dllimport )
+#elif defined( MAMA_DLL ) && defined( MAMACPP )
+ /* We are building mamacpp as a dll */
+# define COMMONExpDLL __declspec( dllimport )
+# define MAMAExpDLL __declspec( dllimport )
+# define MAMACPPExpDLL __declspec( dllexport )
+# define MAMAExpBridgeDLL
+#elif defined( MAMDA_DLL ) && defined( MAMDA )
+ /* We are building mamda as a dll */
+# define COMMONExpDLL __declspec( dllimport )
+# define MAMAExpDLL __declspec( dllimport )
+# define MAMACPPExpDLL __declspec( dllimport )
+# define MAMDAExpDLL __declspec( dllexport )
+# define MAMAExpBridgeDLL
+#elif defined( MAMDA_DLL ) && defined( MAMDAOPT )
+ /* We are building extra mamda as a dll */
+# define COMMONExpDLL __declspec( dllimport )
+# define MAMAExpDLL __declspec( dllimport )
+# define MAMACPPExpDLL __declspec( dllimport )
+# define MAMDAExpDLL __declspec( dllimport )
+# define MAMDAOPTExpDLL __declspec( dllexport )
+# define MAMAExpBridgeDLL
+#elif !defined ( MAMA_STATIC ) && !defined ( WMW_STATIC ) && !defined (WIRECACHE_STATIC)
+ /* We are building mama apps (non static) */
+# define COMMONExpDLL __declspec( dllimport )
+# define WMWExpDLL __declspec( dllexport )
+# define MAMAExpDLL __declspec( dllimport )
+# define MAMACPPExpDLL __declspec( dllimport )
+# define MAMDAExpDLL __declspec( dllimport )
+# define MAMDAOPTExpDLL __declspec( dllimport )
+# define MAMAExpBridgeDLL
+#elif defined( WIN32 ) && defined( WMW_DLL )
+ /* We are building wmw as a dll */
+# define COMMONExpDLL __declspec( dllimport )
+# define WMWExpDLL __declspec( dllexport )
+#elif defined( WIN32 ) && defined( WMW_APP )
+ /* We are building wmw test apps */
+# define COMMONExpDLL __declspec( dllimport )
+# define WMWExpDLL __declspec( dllimport )
+#else
+ /* We are building on linux or statically */
+# define COMMONExpDLL
+# define WMWExpDLL
+# define WCACHEExpDLL
+# define MAMAExpDLL
+# define MAMACPPExpDLL
+# define MAMDAExpDLL
+# define MAMDAOPTExpDLL
+# define MAMAExpBridgeDLL
+#endif
+
+#define WCOMMONINLINE __inline
+#define WCOMMONFORCEINLINE __forceinline
+
+
+#endif /* _WOMBAT_WCONFIG_H */
+
+
diff --git a/common/c_cpp/src/c/wlock.c b/common/c_cpp/src/c/wlock.c
index e23daa6..c57bd5c 100644
--- a/common/c_cpp/src/c/wlock.c
+++ b/common/c_cpp/src/c/wlock.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

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

#include <stdlib.h>
#include <stdio.h>
diff --git a/common/c_cpp/src/c/wombat/wCommon.h b/common/c_cpp/src/c/wombat/wCommon.h
index c40112f..647751b 100644
--- a/common/c_cpp/src/c/wombat/wCommon.h
+++ b/common/c_cpp/src/c/wombat/wCommon.h
@@ -23,7 +23,7 @@
#define _WOMBAT_WCOMMON_H

/* Moved to _os_/port.h */
-#include "port.h"
+#include "wombat/port.h"

struct in_addr resolve_ip(const char * arg);

diff --git a/common/c_cpp/src/c/wombat/wConfig.h b/common/c_cpp/src/c/wombat/wConfig.h
deleted file mode 100644
index c7cf7af..0000000
--- a/common/c_cpp/src/c/wombat/wConfig.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $Id: wConfig.h,v 1.6.2.1.12.4 2011/08/10 14:53:24 nicholasmarriott Exp $
- *
- * OpenMAMA: The open middleware agnostic messaging API
- * Copyright (C) 2011 NYSE Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef _WOMBAT_WCONFIG_H
-#define _WOMBAT_WCONFIG_H
-
-/* Moved to _os_/port/h */
-#include "port.h"
-
-#endif /* _WOMBAT_WCONFIG_H */
-
-
diff --git a/common/c_cpp/src/c/wombat/wConfig.h b/common/c_cpp/src/c/wombat/wConfig.h
new file mode 120000
index 0000000..3414bff
--- /dev/null
+++ b/common/c_cpp/src/c/wombat/wConfig.h
@@ -0,0 +1 @@
+../../.././src/c/linux/wConfig.h
\ No newline at end of file
diff --git a/common/c_cpp/src/c/wombat/wSemaphore.h b/common/c_cpp/src/c/wombat/wSemaphore.h
index 9adb8d2..15e90cf 100644
--- a/common/c_cpp/src/c/wombat/wSemaphore.h
+++ b/common/c_cpp/src/c/wombat/wSemaphore.h
@@ -22,6 +22,6 @@
#ifndef WSEMAPHORE_H__
#define WSEMAPHORE_H__

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

#endif /* WSEMAPHORE_H__ */
diff --git a/common/c_cpp/src/c/wombat/wincompat.h b/common/c_cpp/src/c/wombat/wincompat.h
index c80c60b..4e785e8 100644
--- a/common/c_cpp/src/c/wombat/wincompat.h
+++ b/common/c_cpp/src/c/wombat/wincompat.h
@@ -23,6 +23,6 @@
#define _WOMBAT_WINCOMPAT_H

/* Moved to _os_/port.h */
-#include "port.h"
+#include "wombat/port.h"

#endif /* _WOMBAT_WINCOMPAT_H */
diff --git a/mama/c_cpp/src/c/bridge/avis/bridge.c b/mama/c_cpp/src/c/bridge/avis/bridge.c
index 5f2b973..24c369a 100755
--- a/mama/c_cpp/src/c/bridge/avis/bridge.c
+++ b/mama/c_cpp/src/c/bridge/avis/bridge.c
@@ -21,7 +21,7 @@

#include <avis/elvin.h>

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

#include <mama/mama.h>
#include <timers.h>
diff --git a/mama/c_cpp/src/c/bridge/avis/msg.c b/mama/c_cpp/src/c/bridge/avis/msg.c
index 82176e9..8cc97eb 100644
--- a/mama/c_cpp/src/c/bridge/avis/msg.c
+++ b/mama/c_cpp/src/c/bridge/avis/msg.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include <stdlib.h>
#include <string.h>

diff --git a/mama/c_cpp/src/c/bridge/avis/transportbridge.c b/mama/c_cpp/src/c/bridge/avis/transportbridge.c
index 1d7bc44..c994879 100755
--- a/mama/c_cpp/src/c/bridge/avis/transportbridge.c
+++ b/mama/c_cpp/src/c/bridge/avis/transportbridge.c
@@ -22,7 +22,7 @@
#include <avis/elvin.h>
#include <avis/avis_client_config.h>

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

#include <property.h>
#include <mama/mama.h>
diff --git a/mama/c_cpp/src/c/conflation/connection.c b/mama/c_cpp/src/c/conflation/connection.c
index eddb291..4f0fed9 100644
--- a/mama/c_cpp/src/c/conflation/connection.c
+++ b/mama/c_cpp/src/c/conflation/connection.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/
#include <string.h>
-#include "port.h"
+#include "wombat/port.h"

#include "mama/conflation/connection.h"
#include "conflation/connection_int.h"
diff --git a/mama/c_cpp/src/c/conflation/connection_int.h b/mama/c_cpp/src/c/conflation/connection_int.h
index a478b79..28f8590 100644
--- a/mama/c_cpp/src/c/conflation/connection_int.h
+++ b/mama/c_cpp/src/c/conflation/connection_int.h
@@ -22,7 +22,7 @@
#ifndef MAMA_CONNECTION_INT_H__
#define MAMA_CONNECTION_INT_H__

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

#include "mama/conflation/connection.h"

diff --git a/mama/c_cpp/src/c/conflation/manager.c b/mama/c_cpp/src/c/conflation/manager.c
index 90fed15..53fa5ab 100644
--- a/mama/c_cpp/src/c/conflation/manager.c
+++ b/mama/c_cpp/src/c/conflation/manager.c
@@ -20,7 +20,7 @@
*/

#include <string.h>
-#include "port.h"
+#include "wombat/port.h"

#include "mama/mama.h"
#include "mama/conflation/manager.h"
diff --git a/mama/c_cpp/src/c/conflation/manager_int.h b/mama/c_cpp/src/c/conflation/manager_int.h
index 1464579..7d4bc70 100644
--- a/mama/c_cpp/src/c/conflation/manager_int.h
+++ b/mama/c_cpp/src/c/conflation/manager_int.h
@@ -26,7 +26,7 @@

#ifndef MAMA_MANAGER_INT_H__
#define MAMA_MANAGER_INT_H__
-#include "port.h"
+#include "wombat/port.h"

#include "mama/conflation/manager.h"

diff --git a/mama/c_cpp/src/c/conflation/serverconnection_int.h b/mama/c_cpp/src/c/conflation/serverconnection_int.h
index c5bcb51..1c6fa92 100644
--- a/mama/c_cpp/src/c/conflation/serverconnection_int.h
+++ b/mama/c_cpp/src/c/conflation/serverconnection_int.h
@@ -22,7 +22,7 @@
#ifndef MAMA_SERVER_CONNECTION_INT_H__
#define MAMA_SERVER_CONNECTION_INT_H__

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

#if defined(__cplusplus)
extern "C" {
diff --git a/mama/c_cpp/src/c/imagerequest.c b/mama/c_cpp/src/c/imagerequest.c
index 7e42ed6..b6d855d 100644
--- a/mama/c_cpp/src/c/imagerequest.c
+++ b/mama/c_cpp/src/c/imagerequest.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include <mama/mama.h>
#include <mamainternal.h>
#include <imagerequest.h>
diff --git a/mama/c_cpp/src/c/imagerequest.h b/mama/c_cpp/src/c/imagerequest.h
index 9605916..9c8c6d1 100644
--- a/mama/c_cpp/src/c/imagerequest.h
+++ b/mama/c_cpp/src/c/imagerequest.h
@@ -22,7 +22,7 @@
#ifndef MamaImageRequestH__
#define MamaImageRequestH__

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

#include "wombat/wincompat.h"
#include "throttle.h"
diff --git a/mama/c_cpp/src/c/mama.c b/mama/c_cpp/src/c/mama.c
index 3891b39..206892d 100644
--- a/mama/c_cpp/src/c/mama.c
+++ b/mama/c_cpp/src/c/mama.c
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <limits.h>

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

diff --git a/mama/c_cpp/src/c/mama/conflation/manager.h b/mama/c_cpp/src/c/mama/conflation/manager.h
index 0bce01a..fc7f32a 100644
--- a/mama/c_cpp/src/c/mama/conflation/manager.h
+++ b/mama/c_cpp/src/c/mama/conflation/manager.h
@@ -25,7 +25,7 @@

#include <string.h>

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

#if defined(__cplusplus)
diff --git a/mama/c_cpp/src/c/mama/datetime.h b/mama/c_cpp/src/c/mama/datetime.h
index ecc77d0..c9e862a 100644
--- a/mama/c_cpp/src/c/mama/datetime.h
+++ b/mama/c_cpp/src/c/mama/datetime.h
@@ -26,7 +26,7 @@
#include <mama/status.h>
#include <mama/types.h>
#include <mama/timezone.h>
-#include "port.h"
+#include "wombat/port.h"

#include <time.h>

diff --git a/mama/c_cpp/src/c/mama/fielddesc.h b/mama/c_cpp/src/c/mama/fielddesc.h
index 8d7f907..fbf2d83 100644
--- a/mama/c_cpp/src/c/mama/fielddesc.h
+++ b/mama/c_cpp/src/c/mama/fielddesc.h
@@ -30,7 +30,7 @@
#include <mama/types.h>
#include <stdlib.h>

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

#if defined(__cplusplus)
extern "C" {
diff --git a/mama/c_cpp/src/c/mama/msg.h b/mama/c_cpp/src/c/mama/msg.h
index 2d17d22..77fc94f 100644
--- a/mama/c_cpp/src/c/mama/msg.h
+++ b/mama/c_cpp/src/c/mama/msg.h
@@ -26,7 +26,7 @@
#include <mama/status.h>
#include <mama/fielddesc.h>
#include <mama/msgtype.h>
-#include "port.h"
+#include "wombat/port.h"
#include <stdlib.h>

#define ENTITLE_FIELD_NAME "wEntitleCode"
diff --git a/mama/c_cpp/src/c/mama/msgfield.h b/mama/c_cpp/src/c/mama/msgfield.h
index 191b700..f9931ca 100644
--- a/mama/c_cpp/src/c/mama/msgfield.h
+++ b/mama/c_cpp/src/c/mama/msgfield.h
@@ -27,7 +27,7 @@
#include <mama/fielddesc.h>
#include <stdlib.h>

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

#if defined(__cplusplus)
extern "C" {
diff --git a/mama/c_cpp/src/c/mama/subscriptiontype.h b/mama/c_cpp/src/c/mama/subscriptiontype.h
index 14e023d..6597fad 100644
--- a/mama/c_cpp/src/c/mama/subscriptiontype.h
+++ b/mama/c_cpp/src/c/mama/subscriptiontype.h
@@ -22,7 +22,7 @@
#ifndef MAMA_SUBSC_TYPE_H__
#define MAMA_SUBSC_TYPE_H__

-#include "port.h"
+#include "wombat/port.h"
/*
* This file provides subscription type information.
*/
diff --git a/mama/c_cpp/src/c/mama/timezone.h b/mama/c_cpp/src/c/mama/timezone.h
index 5991b8c..d3f0c97 100644
--- a/mama/c_cpp/src/c/mama/timezone.h
+++ b/mama/c_cpp/src/c/mama/timezone.h
@@ -25,7 +25,7 @@
#include <mama/config.h>
#include <mama/status.h>
#include <mama/types.h>
-#include "port.h"
+#include "wombat/port.h"

#include <time.h>

diff --git a/mama/c_cpp/src/c/mama/types.h b/mama/c_cpp/src/c/mama/types.h
index 4874fc8..d26c206 100644
--- a/mama/c_cpp/src/c/mama/types.h
+++ b/mama/c_cpp/src/c/mama/types.h
@@ -26,7 +26,7 @@
extern "C" {
#endif

-#include "port.h"
+#include "wombat/port.h"
#include <stdlib.h>
#include <string.h>

diff --git a/mama/c_cpp/src/c/msg.c b/mama/c_cpp/src/c/msg.c
index ca26b6b..ca17bf0 100644
--- a/mama/c_cpp/src/c/msg.c
+++ b/mama/c_cpp/src/c/msg.c
@@ -20,7 +20,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include <stdlib.h>
#include <string.h>
#include <assert.h>
diff --git a/mama/c_cpp/src/c/payload/avismsg/avismsgimpl.c b/mama/c_cpp/src/c/payload/avismsg/avismsgimpl.c
index 7d13748..93cecc3 100755
--- a/mama/c_cpp/src/c/payload/avismsg/avismsgimpl.c
+++ b/mama/c_cpp/src/c/payload/avismsg/avismsgimpl.c
@@ -26,7 +26,7 @@

#include <avis/elvin.h>

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

#include <mama/mama.h>
#include "avismsgimpl.h"
diff --git a/mama/c_cpp/src/c/playback/playbackFileParser.h b/mama/c_cpp/src/c/playback/playbackFileParser.h
index 6435033..dea82c6 100644
--- a/mama/c_cpp/src/c/playback/playbackFileParser.h
+++ b/mama/c_cpp/src/c/playback/playbackFileParser.h
@@ -27,7 +27,7 @@
extern "C" {
#endif

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

#include <stdlib.h>
#include <fcntl.h>
diff --git a/mama/c_cpp/src/c/playback/playbackpublisher.h b/mama/c_cpp/src/c/playback/playbackpublisher.h
index 1e638d2..f0e4fc2 100644
--- a/mama/c_cpp/src/c/playback/playbackpublisher.h
+++ b/mama/c_cpp/src/c/playback/playbackpublisher.h
@@ -39,7 +39,7 @@ extern "C" {
#include <lookup2.h>
#include <wombat/wtable.h>
#include "playbackFileParser.h"
-#include "port.h"
+#include "wombat/port.h"

#define BUFFER_SIZE 128
typedef struct mamaFilePlayback_
diff --git a/mama/c_cpp/src/c/queue.c b/mama/c_cpp/src/c/queue.c
index 2dcda25..4026a1a 100644
--- a/mama/c_cpp/src/c/queue.c
+++ b/mama/c_cpp/src/c/queue.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include <mama/mama.h>
#include <mama/queue.h>
#include "bridge.h"
diff --git a/mama/c_cpp/src/c/senderId.c b/mama/c_cpp/src/c/senderId.c
index f37c94c..8b4c849 100644
--- a/mama/c_cpp/src/c/senderId.c
+++ b/mama/c_cpp/src/c/senderId.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include "wombat/wincompat.h"
#include "mama/senderId.h"

diff --git a/mama/c_cpp/src/c/stat.c b/mama/c_cpp/src/c/stat.c
index 4564edb..89b257c 100644
--- a/mama/c_cpp/src/c/stat.c
+++ b/mama/c_cpp/src/c/stat.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include <string.h>
#include <stddef.h>
#include "wombat/wincompat.h"
diff --git a/mama/c_cpp/src/c/timezone.c b/mama/c_cpp/src/c/timezone.c
index a18a7ad..90698b6 100644
--- a/mama/c_cpp/src/c/timezone.c
+++ b/mama/c_cpp/src/c/timezone.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include "wombat/environment.h"
#include <mama/timezone.h>
#include <list.h>
diff --git a/mama/c_cpp/src/examples/c/mamainboxc.c b/mama/c_cpp/src/examples/c/mamainboxc.c
index 9f528b8..4e2b9b7 100644
--- a/mama/c_cpp/src/examples/c/mamainboxc.c
+++ b/mama/c_cpp/src/examples/c/mamainboxc.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

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

diff --git a/mama/c_cpp/src/examples/c/mamaio.c b/mama/c_cpp/src/examples/c/mamaio.c
index 4066ca9..47df6e3 100644
--- a/mama/c_cpp/src/examples/c/mamaio.c
+++ b/mama/c_cpp/src/examples/c/mamaio.c
@@ -30,7 +30,7 @@
* [-q] Quiet mode. Suppress output.
*---------------------------------------------------------------------------*/

-#include "port.h"
+#include "wombat/port.h"
#include <sys/types.h>
#include <errno.h>
#include <string.h>
diff --git a/mama/c_cpp/src/examples/c/mamalistenc.c b/mama/c_cpp/src/examples/c/mamalistenc.c
index b57ce87..80ca789 100644
--- a/mama/c_cpp/src/examples/c/mamalistenc.c
+++ b/mama/c_cpp/src/examples/c/mamalistenc.c
@@ -58,7 +58,7 @@
*
*/

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

#include <stdlib.h>
#include <stdio.h>
diff --git a/mama/c_cpp/src/examples/c/mamaproxyc.c b/mama/c_cpp/src/examples/c/mamaproxyc.c
index 993e140..dfb5aa0 100644
--- a/mama/c_cpp/src/examples/c/mamaproxyc.c
+++ b/mama/c_cpp/src/examples/c/mamaproxyc.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

-#include "port.h"
+#include "wombat/port.h"
#include "mama/mama.h"
#include "mama/log.h"
#include "mama/msgtype.h"
diff --git a/mama/c_cpp/src/examples/c/mamapublisherc.c b/mama/c_cpp/src/examples/c/mamapublisherc.c
index 0ed845c..e00ea9d 100644
--- a/mama/c_cpp/src/examples/c/mamapublisherc.c
+++ b/mama/c_cpp/src/examples/c/mamapublisherc.c
@@ -19,7 +19,7 @@
* 02110-1301 USA
*/

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

#include "mama/mama.h"
#include "string.h"
--
1.7.7.6