[PATCH 06/30] Moved wincompat.h contents to _os_/port.h


Michael Schonberg <mschonberg@...>
 

In preparation for windows support, wincompat.h now simply includes the
appropriate port.h file. The file remains in the tree as other products
include it.

Signed-off-by: Mike Schonberg <mschonberg@nyx.com>
---
common/c_cpp/src/c/linux/port.h | 4 +++
common/c_cpp/src/c/wombat/wincompat.h | 48 +--------------------------------
2 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/common/c_cpp/src/c/linux/port.h b/common/c_cpp/src/c/linux/port.h
index a1de75d..1a00b25 100644
--- a/common/c_cpp/src/c/linux/port.h
+++ b/common/c_cpp/src/c/linux/port.h
@@ -81,6 +81,8 @@ typedef long long int w_i64_t;
/* For delimiting multiple paths in env variables properties */
#define PATH_DELIM ':'

+#define PATHSEP "/"
+
/* Use Posix semaphores for Linux */
#define wsem_t sem_t
#define wsem_init sem_init
@@ -92,6 +94,8 @@ typedef long long int w_i64_t;

int wsem_timedwait (wsem_t* sem, unsigned int ts);

+#define CPU_AFFINITY_SET cpu_set_t
+
/* User pthreads for linux */
#define wthread_mutex_t pthread_mutex_t
#define wthread_mutex_init pthread_mutex_init
diff --git a/common/c_cpp/src/c/wombat/wincompat.h b/common/c_cpp/src/c/wombat/wincompat.h
index 756ecea..c80c60b 100644
--- a/common/c_cpp/src/c/wombat/wincompat.h
+++ b/common/c_cpp/src/c/wombat/wincompat.h
@@ -22,53 +22,7 @@
#ifndef _WOMBAT_WINCOMPAT_H
#define _WOMBAT_WINCOMPAT_H

+/* Moved to _os_/port.h */
#include "port.h"
-#include "wConfig.h"
-
-#define PATHSEP "/"
-#define CPU_AFFINITY_SET cpu_set_t
-
-#define wthread_mutex_t pthread_mutex_t
-#define wthread_mutex_init pthread_mutex_init
-#define wthread_mutex_unlock pthread_mutex_unlock
-#define wthread_mutex_lock pthread_mutex_lock
-#define wthread_mutex_destroy pthread_mutex_destroy
-
-#define wthread_t pthread_t
-#define wthread_detach pthread_detach
-#define wthread_self pthread_self
-#define wthread_equal pthread_equal
-#define wthread_cleanup_push pthread_cleanup_push
-#define wthread_cleanup_pop pthread_cleanup_pop
-#define wthread_join pthread_join
-#define wthread_create pthread_create
-#define wthread_exit pthread_exit
-
-#define wthread_cond_t pthread_cond_t
-#define wthread_cond_init pthread_cond_init
-#define wthread_cond_signal pthread_cond_signal
-#define wthread_cond_destroy pthread_cond_destroy
-#define wthread_cond_wait pthread_cond_wait
-
-#define wthread_spinlock_t pthread_spinlock_t
-#define wthread_spin_init pthread_spin_init
-#define wthread_spin_unlock pthread_spin_unlock
-#define wthread_spin_lock pthread_spin_lock
-#define wthread_spin_destroy pthread_spin_destroy
-
-#define wdlopen dlopen
-#define wdlsym dlsym
-#define wdlclose dlclose
-#define wdlerror dlerror
-
-#define wthread_attr_t pthread_attr_t
-#define wthread_attr_init pthread_attr_init
-#define wthread_attr_setdetachstate pthread_attr_setdetachstate
-
-#define wthread_mutexattr_t pthread_mutexattr_t
-#define wthread_mutexattr_init pthread_mutexattr_init
-#define wthread_mutexattr_settype pthread_mutexattr_settype
-
-#define wGetCurrentThreadId pthread_self

#endif /* _WOMBAT_WINCOMPAT_H */
--
1.7.7.6