From ab665c8c56a79e0cc1a85afe49acd176a00421cc Mon Sep 17 00:00:00 2001
From: Marshall Clow <marshall@idio.com>
Date: Mon, 2 May 2011 20:56:53 +0000
Subject: [PATCH] Merge fixes to release; Fixes #1988

[SVN r71676]
---
 src/win32/thread.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/win32/thread.cpp b/src/win32/thread.cpp
index 72bf4190..b9434621 100644
--- a/src/win32/thread.cpp
+++ b/src/win32/thread.cpp
@@ -9,7 +9,6 @@
 
 #include <boost/thread/thread.hpp>
 #include <algorithm>
-#include <windows.h>
 #ifndef UNDER_CE
 #include <process.h>
 #endif
@@ -20,6 +19,7 @@
 #include <boost/throw_exception.hpp>
 #include <boost/thread/detail/tss_hooks.hpp>
 #include <boost/date_time/posix_time/conversion.hpp>
+#include <windows.h>
 
 namespace boost
 {
@@ -67,7 +67,7 @@ namespace boost
                 boost::throw_exception(thread_resource_error());
         }
 
-#ifdef BOOST_NO_THREADEX
+#ifndef BOOST_HAS_THREADEX
 // Windows CE doesn't define _beginthreadex
 
         struct ThreadProxyData