--- a/examples/DS401_Slave_Gui/TestSlaveGui.cpp	Fri Feb 19 08:19:23 2010 +0100
+++ b/examples/DS401_Slave_Gui/TestSlaveGui.cpp	Tue Feb 23 08:09:57 2010 +0100
@@ -20,14 +20,9 @@
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-
-#include <wx/wxprec.h>
-#include <wx/wx.h>
-#include <wx/textctrl.h>
-#include <iostream>
-
 #if defined(WIN32) && !defined(__CYGWIN__)
 #include <windows.h>
+#include "getopt.h"
 #else
 #include <stdio.h>
 #include <string.h>
@@ -36,6 +31,14 @@
 #include <signal.h>
 #endif
 
+
+#include <wx/wxprec.h>
+#include <wx/wx.h>
+#include <wx/textctrl.h>
+#include <iostream>
+
+
+
 //#include <can_driver.h>
 //#include <timers_driver.h>
 extern "C"
@@ -73,9 +76,9 @@
 main_can (s_BOARD SlaveBoard, char *LibraryPath)
 {
 #if !defined(WIN32) && !defined(__CYGWIN__)
+	//TimerInit();
+#endif	
 	TimerInit();
-#endif	
-	
 	printf ("Bus name: %s        Freq: %s       Driver: %s\n",
 	  SlaveBoard.busname, SlaveBoard.baudrate, LibraryPath);