From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 6 Oct 2006 08:40:08 +0000 (+0000)
Subject: And now, a syntaxically correct version of my 'cleanup' (sorry)
X-Git-Tag: v3.3~2499
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c9cec0dc29c4015e8600560b23772f22076044d7?hp=2aeae90fc3ac7059522d23c855dc0d4522d080a2

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 269556becc..037b808c8c 100644
--- 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__)