From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 6 Oct 2006 08:25:50 +0000 (+0000)
Subject: Cleanup malek's add
X-Git-Tag: v3.3~2502
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/888a7206df16f0ab8f8c02f9b18d0d1a0229cf2b

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 0d35e12663..269556becc 100644
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -53,12 +53,10 @@ int gras_os_getpid(void);
 
 
 /* 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"
-#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)