--- branches/linux-serial/serial1.cpp	2007/02/04 20:11:41	43
+++ branches/linux-serial/serial1.cpp	2007/02/04 21:22:44	44
@@ -1,8 +1,13 @@
 // serial1.cpp : Defines the entry point for the console application.
 //
 
+#ifdef _WINDOWS
 #include "stdafx.h"
+
 #include "serial1.h"
+#endif
+
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
@@ -13,9 +18,8 @@
 #include <iomanip>
 #include <exception>
 
-#include <conio.h>
 
-void pause()
+void my_pause()
 {
 	char d[1];
 	std::cout << "Press enter to continue" << std::endl;
@@ -74,7 +78,7 @@
 	//std::cout << serial.readTarget(2) << std::endl;
 
 
-	pause();
+	my_pause();
 	return 0;
 }