diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-23 17:24:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-23 17:24:12 +0100 |
| commit | 38cedccdb55e35c8f6b835cfb7405ab2160889e0 (patch) | |
| tree | e8f6d5989644339ee50aad69c52e4894668c45ab /src/lib/cross.h | |
| parent | 5a454b3e7b36b41440424929d67400641bbb8d68 (diff) | |
Merge Windows CPU code from master.
Diffstat (limited to 'src/lib/cross.h')
| -rw-r--r-- | src/lib/cross.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/cross.h b/src/lib/cross.h index a00fee679..58fa821c7 100644 --- a/src/lib/cross.h +++ b/src/lib/cross.h @@ -26,6 +26,6 @@ class Log; void dcpomatic_sleep (int); -extern std::pair<std::string, int> cpu_info (); +extern std::string cpu_info (); extern void run_ffprobe (boost::filesystem::path, boost::filesystem::path, boost::shared_ptr<Log>); extern std::list<std::pair<std::string, std::string> > mount_info (); |