projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2919cc
)
Fix OS X build.
author
Carl Hetherington
<cth@carlh.net>
Mon, 15 Aug 2016 14:33:20 +0000
(15:33 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 15 Aug 2016 14:33:20 +0000
(15:33 +0100)
src/lib/cross.cc
patch
|
blob
|
history
diff --git
a/src/lib/cross.cc
b/src/lib/cross.cc
index a213436a3c3f973aafccb83e7a800aa07b417fc1..454fe044cb51b2e19b3c646ba4d87738cbf762dc 100644
(file)
--- a/
src/lib/cross.cc
+++ b/
src/lib/cross.cc
@@
-397,12
+397,12
@@
start_batch_converter (boost::filesystem::path dcpomatic)
#endif
}
-
in
t
+
uint64_
t
thread_id ()
{
#ifdef DCPOMATIC_WINDOWS
- return (
in
t) GetCurrentThreadId ();
+ return (
uint64_
t) GetCurrentThreadId ();
#else
- return (
in
t) pthread_self ();
+ return (
uint64_
t) pthread_self ();
#endif
}