Merge branch 'master' of https://github.com/OpenLightingProject/ola i…

…nto libusb
OpenLightingProject · Dec 14, 2014 · 03bd22f · 03bd22f
2 parents c7dd4cb + 3f007bf
commit 03bd22f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/common/base/Init.cpp b/common/base/Init.cpp
@@ -80,7 +80,11 @@ using std::string;
  * @brief Print a stack trace.
  */
 static void _DumpStackAndExit(int sig) {
-  cout << "Received " << strsignal(sig)  << endl;
+#ifdef _WIN32
+  cout << "Received " << sig << endl;
+#else
+  cout << "Received " << strsignal(sig) << endl;
+#endif
   #ifdef HAVE_EXECINFO_H
   enum {STACK_SIZE = 64};
   void *array[STACK_SIZE];
@@ -247,7 +251,7 @@ bool NetworkInit() {
 bool InstallSignal(int sig, void(*fp)(int signo)) {
 #ifdef _WIN32
   if (::signal(sig, fp) == SIG_ERR) {
-    OLA_WARN << "signal(" << strsignal(sig) << ": " << strerror(errno);
+    OLA_WARN << "signal(" << sig << ": " << strerror(errno);
     return false;
   }
 #else

diff --git a/common/thread/ThreadTest.cpp b/common/thread/ThreadTest.cpp
@@ -175,7 +175,8 @@ void ThreadTest::testSchedulingOptions() {
     options.priority = max_priority;
     MockThread thread(options);
     OLA_ASSERT_TRUE(RunThread(&thread));
-    OLA_ASSERT_EQ(SCHED_FIFO, thread.GetSchedulingParams().policy);
+    OLA_ASSERT_EQ(static_cast<int>(SCHED_FIFO),
+                  thread.GetSchedulingParams().policy);
     OLA_ASSERT_EQ(max_priority, thread.GetSchedulingParams().priority);
   }
 
@@ -202,7 +203,8 @@ void ThreadTest::testSchedulingOptions() {
     options.priority = max_priority;
     MockThread thread(options);
     OLA_ASSERT_TRUE(RunThread(&thread));
-    OLA_ASSERT_EQ(SCHED_RR, thread.GetSchedulingParams().policy);
+    OLA_ASSERT_EQ(static_cast<int>(SCHED_RR),
+                  thread.GetSchedulingParams().policy);
     OLA_ASSERT_EQ(max_priority, thread.GetSchedulingParams().priority);
   }