And now, a syntaxically correct version of my 'cleanup' (sorry)

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

diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index 269556b..037b808 100644 (file)
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -53,7 +53,7 @@ int gras_os_getpid(void);
 
 
 /* the machine context */
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) | defined(__TOS_WIN__)
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)
 #include "xbt/win32_context.h"
 
 #elif defined(__EX_MCTX_MCSC__)