Merge master.

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

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 110660b16ea1783fec6b625d8a6748e793974e00..d185286b1f381d02395ba36261313eaac3c10432 100644 (file)
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -17,8 +17,9 @@
 
 */
 
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 #define WEXITSTATUS(w) (w)
 #endif
 
-void dvdomatic_sleep (int);
+void dcpomatic_sleep (int);
+extern std::pair<std::string, int> cpu_info ();