From: Mike Schonberg <mschonberg@...> This very large patch set consists of minor new features and bug fixes introduced by NYSE Technologies as part of routine maintenance of the current MAMA

Renamed resolve_ip() to avoid naming conflicts. Also removed shared object export prefixes from port.h as they are now in wConfig.h. Signed-off-by: Mike 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

These are simple macros for manipulating shared objects. Windows uses the corresponding Win32 Methods. Signed-off-by: Mike Schonberg <mschonberg@...> --- common/c_cpp/src/c/linux/port.h | 6

This needs to be split into several patches. The changes include correct calling conventions for dynamic linking, and other minor issues that arose building for WDF, and NYSE commercial

These files contain macros and functions required to support Windows withouth the need for #ifdef WIN scattered through out the code. Signed-off-by: Mike Schonberg <mschonberg@...> ---

The windows specific logic for memory mapped files was incorrect and likely would not work. PAGE_READONLY should be passed to CreateFileMapping(), not OpenFile(). It is not clear whether this

Most were callbacks where __stdcall needed to be replaced with MAMACALLTYPE or "#include "wincompat.h"" which can be replaced with "port.h". Signed-off-by: Mike Schonberg <mschonberg@...> ---

The callbacks need to be MAMACALLTYPE (__stdcall) and include port.h rather than using #ifdef WIN32 Signed-off-by: Mike Schonberg <mschonberg@...> --- mama/c_cpp/src/c/conflation/manager.c

The calling convention for the methods must be COMMONExpDLL and callbacks need MAMACALLTYPE to workproperly for windows. Signed-off-by: Mike Schonberg <mschonberg@...> ---

Added wnanaosleep() and timegm() since Windows does not support these calls. Also fixed up method signatures for linking on windows. Signed-off-by: Mike Schonberg <mschonberg@...> ---

timegm() is not avaliable on windows so we need a macro to abstract the method. The windows implementation is simple using mktime() and temporarily setting the timezone to GMT. Signed-off-by: Mike

From: Mike Schonberg <mschonberg@...> These inline asm functions are os depenent. Signed-off-by: Mike Schonberg <mschonberg@...> --- common/c_cpp/configure.ac | 1 +

Converted pthread_xxx calls to wthread_xxx. Use getLogin(), getIpAddress(), and getHostName() from common for os dependent implemnatons of these functions. Signed-off-by: Mike Schonberg

Added to linux/port.h and linux/network.c for windows support. The API calls to determine the hostname and ip address are os specific. Signed-off-by: Mike Schonberg <mschonberg@...> ---

In preparation for windows support macros for pthread style thread local storage added to linux/port.h wthread_key_create wthread_key_delete wthread_getspecific wthread_setspecific These map

This is os dependent and defined in common/.../_os_/port.h Signed-off-by: Mike Schonberg <mschonberg@...> --- mama/c_cpp/src/c/fileutils.c | 1 - 1 files changed, 0 insertions(+), 1

Use MAMACALLTYPE (__stdcall for windows) for callbacks. Move os dependent network calls to common/.../_os_/. Fixed some compiler warnings. Signed-off-by: Mike Schonberg <mschonberg@...> ---

Removed Linux specific #include's from MAMA files and added the missing ones to common/.../linux/port.h. Signed-off-by: Mike Schonberg <mschonberg@...> --- common/c_cpp/src/c/linux/port.h | 6

In preparation for windows support, replace global phread_mutex_t and wthread_mutex_t inititialized with PTHREAD_MUTEX_INITIALIZER with wthread_gobal_mtuex() macros. This is required because Windows