[Boost-commit] svn:boost r83318 - trunk/boost/thread/win32

Subject: [Boost-commit] svn:boost r83318 - trunk/boost/thread/win32
From: vicente.botet_at_[hidden]
Date: 2013-03-05 13:57:36

Author: viboes
Date: 2013-03-05 13:57:34 EST (Tue, 05 Mar 2013)
New Revision: 83318
URL: http://svn.boost.org/trac/boost/changeset/83318

Log:
Thread: try to fix double definition of GetTickCount64.
Text files modified: 
   trunk/boost/thread/win32/thread_primitives.hpp |     9 +++++----                               
   1 files changed, 5 insertions(+), 4 deletions(-)

Modified: trunk/boost/thread/win32/thread_primitives.hpp
==============================================================================
--- trunk/boost/thread/win32/thread_primitives.hpp	(original)
+++ trunk/boost/thread/win32/thread_primitives.hpp	2013-03-05 13:57:34 EST (Tue, 05 Mar 2013)
@@ -154,11 +154,9 @@
                 __declspec(dllimport) unsigned long __stdcall QueueUserAPC(queue_user_apc_callback_function,void*,ulong_ptr);
 
                 __declspec(dllimport) unsigned long __stdcall GetTickCount();
-#ifdef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64
+# ifdef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64
                 __declspec(dllimport) ticks_type __stdcall GetTickCount64();
-#else
-                inline ticks_type GetTickCount64() { return GetTickCount(); }
-#endif
+# endif
 # ifndef UNDER_CE
                 __declspec(dllimport) unsigned long __stdcall GetCurrentProcessId();
                 __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId();
@@ -175,6 +173,9 @@
                 using ::ResetEvent;
 # endif
             }
+# ifndef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64
+            inline ticks_type GetTickCount64() { return GetTickCount(); }
+# endif
         }
     }
 }