From 7af7ab498bb4b50bc558fc5f8d652a55c8b13308 Mon Sep 17 00:00:00 2001 From: syntheticpp Date: Tue, 26 Jul 2005 13:09:16 +0000 Subject: [PATCH] fix logical error git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@175 7ec92016-0320-0410-acc4-a06ded1c099a --- include/loki/Threads.h | 2 +- tools/RegressionTest/SingletonTest.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/loki/Threads.h b/include/loki/Threads.h index 97ef97b..c3e6dcb 100644 --- a/include/loki/Threads.h +++ b/include/loki/Threads.h @@ -62,7 +62,7 @@ namespace Loki { lval = val; } }; -#if defined(_WINDOWS_) && defined(_WINDOWS_H) // && defined(__WIN32) +#if defined(_WINDOWS_) || defined(_WINDOWS_H) // && defined(__WIN32) //////////////////////////////////////////////////////////////////////////////// // class template ObjectLevelLockable diff --git a/tools/RegressionTest/SingletonTest.h b/tools/RegressionTest/SingletonTest.h index 8d368e8..dd6b6ad 100644 --- a/tools/RegressionTest/SingletonTest.h +++ b/tools/RegressionTest/SingletonTest.h @@ -77,7 +77,7 @@ namespace typedef SingletonHolder, CreateStatic, NoDestroy, SingleThreaded> t20; //#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__) -#if defined(_WINDOWS_) && defined(_WINDOWS_H) // && defined(__WIN32) +#if defined(_WINDOWS_) || defined(_WINDOWS_H) // && defined(__WIN32) typedef SingletonHolder, CreateUsingNew, DefaultLifetime, ClassLevelLockable> t5; typedef SingletonHolder, CreateUsingNew, PhoenixSingleton, ClassLevelLockable> t6; @@ -128,7 +128,7 @@ public: MAKE_TEST(t20) //#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__) -#if defined(_WINDOWS_) && defined(_WINDOWS_H) // && defined(__WIN32) +#if defined(_WINDOWS_) || defined(_WINDOWS_H) // && defined(__WIN32) MAKE_TEST(t5) MAKE_TEST(t6)