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.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"
#include <fstream>
#include <boost/algorithm/string.hpp>
#include "cross.h"
-#ifdef D
VD
OMATIC_POSIX
+#ifdef D
CP
OMATIC_POSIX
#include <unistd.h>
#endif
#include <unistd.h>
#endif
-#ifdef D
VD
OMATIC_WINDOWS
+#ifdef D
CP
OMATIC_WINDOWS
#include "windows.h"
#endif
#include "windows.h"
#endif
-#ifdef D
VD
OMATIC_OSX
+#ifdef D
CP
OMATIC_OSX
#include <sys/sysctl.h>
#endif
#include <sys/sysctl.h>
#endif
@@
-35,12
+35,12
@@
using std::ifstream;
using std::string;
void
using std::string;
void
-d
vd
omatic_sleep (int s)
+d
cp
omatic_sleep (int s)
{
{
-#ifdef D
VD
OMATIC_POSIX
+#ifdef D
CP
OMATIC_POSIX
sleep (s);
#endif
sleep (s);
#endif
-#ifdef D
VD
OMATIC_WINDOWS
+#ifdef D
CP
OMATIC_WINDOWS
Sleep (s * 1000);
#endif
}
Sleep (s * 1000);
#endif
}
@@
-52,7
+52,7
@@
cpu_info ()
pair<string, int> info;
info.second = 0;
pair<string, int> info;
info.second = 0;
-#ifdef D
VD
OMATIC_LINUX
+#ifdef D
CP
OMATIC_LINUX
ifstream f ("/proc/cpuinfo");
while (f.good ()) {
string l;
ifstream f ("/proc/cpuinfo");
while (f.good ()) {
string l;
@@
-68,7
+68,7
@@
cpu_info ()
}
#endif
}
#endif
-#ifdef D
VD
OMATIC_OSX
+#ifdef D
CP
OMATIC_OSX
size_t N = sizeof (info.second);
sysctlbyname ("hw.ncpu", &info.second, &N, 0, 0);
char buffer[64];
size_t N = sizeof (info.second);
sysctlbyname ("hw.ncpu", &info.second, &N, 0, 0);
char buffer[64];