Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x

4 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/checker.cc b/src/lib/checker.cc
index 13d9aacee..2d15dd3f1 100644
--- a/src/lib/checker.cc
+++ b/src/lib/checker.cc
@@ -81,7 +81,7 @@ Checker::thread ()
 		}
 
 		lm.unlock ();
-		dcpomatic_sleep (_period);
+		dcpomatic_sleep_seconds (_period);
 	}
 }
 
diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index a7fb298cb..1b83bad7c 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -65,7 +65,7 @@ using boost::shared_ptr;
 
 /** @param s Number of seconds to sleep for */
 void
-dcpomatic_sleep (int s)
+dcpomatic_sleep_seconds (int s)
 {
 #ifdef DCPOMATIC_POSIX
 	sleep (s);
diff --git a/src/lib/cross.h b/src/lib/cross.h
index 2e8b8e429..4067631bc 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -37,7 +37,7 @@
 class Log;
 struct AVIOContext;
 
-void dcpomatic_sleep (int);
+void dcpomatic_sleep_seconds (int);
 extern std::string cpu_info ();
 extern void run_ffprobe (boost::filesystem::path, boost::filesystem::path);
 extern std::list<std::pair<std::string, std::string> > mount_info ();
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 234c22246..bbb444367 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -967,7 +967,7 @@ show_jobs_on_console (bool progress)
 	bool error = false;
 	while (true) {
 
-		dcpomatic_sleep (5);
+		dcpomatic_sleep_seconds (5);
 
 		list<shared_ptr<Job> > jobs = JobManager::instance()->get();