[Libreoffice-commits] .: sal/qa

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Aug 24 21:24:05 PDT 2012


 sal/qa/rtl/uuid/rtl_Uuid.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 5e7249f9958aeb0407e8502b500d6865e5af8750
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Sat Aug 25 00:23:33 2012 -0400

    Perhaps this will fix the windows build?
    
    Change-Id: Ia57ab6bfa9e7fa663b699627cec07d19a378b293

diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index 363cd72..056ae3d 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -38,7 +38,9 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 
-#ifdef UNX
+#ifdef WNT
+#include <windows.h>
+#elif defined UNX
 #include <unistd.h>
 #include <time.h>
 #endif
@@ -156,10 +158,9 @@ namespace ThreadHelper
      void thread_sleep(sal_Int32 _nSec)
     {
 #ifdef WNT      //Windows
-        Sleep(_nSec * 10 );
-#endif
-#if ( defined UNX )
-        sleep( _nSec );
+        ::Sleep(_nSec * 10);
+#elif defined UNX
+        ::sleep(_nSec);
 #endif
     }
 }


More information about the Libreoffice-commits mailing list