Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / lib / cross.cc

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index b33fa80ac81d3da7e235ded347a0088aabb744f8..454fe044cb51b2e19b3c646ba4d87738cbf762dc 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -397,8 +397,12 @@ start_batch_converter (boost::filesystem::path dcpomatic)
 #endif
 }
 
-int
+uint64_t
 thread_id ()
 {
-       return (int) pthread_self ();
+#ifdef DCPOMATIC_WINDOWS
+       return (uint64_t) GetCurrentThreadId ();
+#else
+       return (uint64_t) pthread_self ();
+#endif
 }