Merge master.

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

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 7fbba86f9a46195f59857d7d42ac47d83493eb08..ffd44eb02810cd0107145e8a3e5eaeedb917509f 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -20,13 +20,13 @@
 #include <fstream>
 #include <boost/algorithm/string.hpp>
 #include "cross.h"
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 #include <unistd.h>
 #endif
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 #include "windows.h"
 #endif
-#ifdef DVDOMATIC_OSX
+#ifdef DCPOMATIC_OSX
 #include <sys/sysctl.h>
 #endif
 
@@ -35,12 +35,12 @@ using std::ifstream;
 using std::string;
 
 void
-dvdomatic_sleep (int s)
+dcpomatic_sleep (int s)
 {
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
        sleep (s);
 #endif
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
        Sleep (s * 1000);
 #endif
 }
@@ -52,7 +52,7 @@ cpu_info ()
        pair<string, int> info;
        info.second = 0;
        
-#ifdef DVDOMATIC_LINUX
+#ifdef DCPOMATIC_LINUX
        ifstream f ("/proc/cpuinfo");
        while (f.good ()) {
                string l;
@@ -68,7 +68,7 @@ cpu_info ()
        }
 #endif
 
-#ifdef DVDOMATIC_OSX
+#ifdef DCPOMATIC_OSX
        size_t N = sizeof (info.second);
        sysctlbyname ("hw.ncpu", &info.second, &N, 0, 0);
        char buffer[64];