From ede30ccdeab2324de82a71954a85e99ffb3e6c98 Mon Sep 17 00:00:00 2001 From: Josh Hursey Date: Tue, 12 Apr 2005 05:40:19 +0000 Subject: [PATCH] Windows build checkpoint... This commit was SVN r5266. --- src/datatype/.compile_files | 1 + src/runtime/orte_wait.c | 5 ----- src/runtime/orte_wait.h | 3 --- src/win32/win_compat.h | 14 ++++++++++++++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/datatype/.compile_files b/src/datatype/.compile_files index a8362172ff..5b70edf68f 100644 --- a/src/datatype/.compile_files +++ b/src/datatype/.compile_files @@ -13,3 +13,4 @@ dt_pack.c dt_sndrcv.c dt_unpack.c fake_stack.c +dt_external32.c diff --git a/src/runtime/orte_wait.c b/src/runtime/orte_wait.c index 724ecc6e9f..67dda237bb 100644 --- a/src/runtime/orte_wait.c +++ b/src/runtime/orte_wait.c @@ -39,8 +39,6 @@ #include "threads/condition.h" -#ifndef WIN32 - /********************************************************************* * * Local Class Declarations @@ -612,6 +610,3 @@ internal_waitpid_callback(int fd, short event, void *arg) ompi_condition_signal(&(data->cond)); } #endif - - -#endif /* ifndef WIN32 */ diff --git a/src/runtime/orte_wait.h b/src/runtime/orte_wait.h index 23f23d2a64..e7d4d731a4 100644 --- a/src/runtime/orte_wait.h +++ b/src/runtime/orte_wait.h @@ -29,8 +29,6 @@ #include #endif -#ifndef WIN32 - /** typedef for callback function used in \c ompi_rte_wait_cb */ typedef void (*orte_wait_fn_t)(pid_t wpid, int status, void *data); @@ -91,5 +89,4 @@ int orte_wait_kill(int sig); */ int orte_wait_finalize(void); -#endif /* #ifndef WIN32 */ #endif /* #ifndef ORTE_WAIT_H */ diff --git a/src/win32/win_compat.h b/src/win32/win_compat.h index f1f5e4570e..489ff471a9 100644 --- a/src/win32/win_compat.h +++ b/src/win32/win_compat.h @@ -76,4 +76,18 @@ typedef unsigned int uint; #define SIZEOF_SIZE_T 4 #define __func__ __FUNCTION__ +/* Ugly signal mapping since windows doesn't support the full spectrum + * just a very small subset... :/ + * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt_raise.asp + */ +#define SIGCHLD SIGILL + +/* Note: + * The two defines below are likely to break the orte_wait + * functionality. The proper method of replacing these bits + * of functionality is left for further investigated. + */ +#define WUNTRACED 0 +#define WNOHANG 0 + #endif /* compat */