projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
cross.h
diff --git
a/src/lib/cross.h
b/src/lib/cross.h
index 970bf3e9dc00b4b60486c330d6c077322614ea9a..d185286b1f381d02395ba36261313eaac3c10432 100644
(file)
--- a/
src/lib/cross.h
+++ b/
src/lib/cross.h
@@
-17,11
+17,9
@@
*/
-#include <string>
-
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
#define WEXITSTATUS(w) (w)
#endif
-void d
vd
omatic_sleep (int);
+void d
cp
omatic_sleep (int);
extern std::pair<std::string, int> cpu_info ();