Fix Windows build

barotto · Jun 6, 2015 · 7513f3c · 7513f3c
1 parent d09515c
commit 7513f3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/hardware/devices/serial.cpp b/src/hardware/devices/serial.cpp
@@ -446,7 +446,7 @@ void Serial::init_mode_socket(uint comn, std::string dev, uint mode)
 	}
 }
 
-void Serial::init_mode_pipe(uint /*comn*/, std::string dev, uint mode)
+void Serial::init_mode_pipe(uint comn, std::string dev, uint mode)
 {
 	if(dev.empty()) {
 		return;

diff --git a/src/mixer.h b/src/mixer.h
@@ -28,6 +28,7 @@
 #include "wav.h"
 #include <thread>
 #include <atomic>
+#include <cmath>
 #include <samplerate.h>
 
 class Machine;
@@ -183,7 +184,7 @@ class Mixer
 	void cmd_stop_capture();
 	void cmd_toggle_capture();
 
-	static int us_to_samples(int _us, int _rate) {
+	static inline int us_to_samples(int _us, int _rate) {
 		return round(double(_us) * double(_rate)/1e6);
 	}
 };
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     }
-    void Serial::init_mode_pipe(uint /*comn*/, std::string dev, uint mode)
+    void Serial::init_mode_pipe(uint comn, std::string dev, uint mode)
     {
     	if(dev.empty()) {
     		return;
@@ Expand Down @@