Cleanup malek's add

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2857 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index 0d35e12..269556b 100644 (file)
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -53,12 +53,10 @@ int gras_os_getpid(void);
 
 
 /* the machine context */
 
 
 /* the machine context */

-#if defined(__EX_MCTX_MCSC__)
-#if !defined(_WIN32) && !defined(__WIN32__) && !defined(WIN32) && !defined(__TOS_WIN__)
-#include <ucontext.h>            /* POSIX.1 ucontext(3) */
-#else
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) | defined(__TOS_WIN__)

 #include "xbt/win32_context.h"
 #include "xbt/win32_context.h"

-#endif
+
+#elif defined(__EX_MCTX_MCSC__)

 #include <ucontext.h>            /* POSIX.1 ucontext(3) */
 #define __ex_mctx_struct         ucontext_t uc;
 #define __ex_mctx_save(mctx)     (getcontext(&(mctx)->uc) == 0)
 #include <ucontext.h>            /* POSIX.1 ucontext(3) */
 #define __ex_mctx_struct         ucontext_t uc;
 #define __ex_mctx_save(mctx)     (getcontext(&(mctx)->uc) == 0)