BSD Porting fixes, conditional compilation and use of gettimeofday()

src/Mod/Image/Gui/Command.cpp

@@ -20,7 +20,9 @@
 #endif
 
 #include <time.h>
+#if defined(FC_OS_WIN32)
 #include <sys/timeb.h>
+#endif
 
 #include <Base/Exception.h>
 #include <Base/Interpreter.h>

src/Mod/Mesh/App/WildMagic4/Wm4System.cpp

@@ -22,7 +22,7 @@ using namespace Wm4;
 #include <sys/stat.h>
 
 // support for GetTime
-#ifdef __APPLE__
+#if !defined(WIN32)
 #include <sys/time.h>
 static timeval gs_kInitial;
 static bool gs_bInitializedTime = false;
@@ -103,7 +103,7 @@ void System::EndianCopy (int iSize, int iQuantity, const void* pvSrc,
 //----------------------------------------------------------------------------
 double System::GetTime ()
 {
-#ifdef __APPLE__
+#if !defined(WIN32)
     if (!gs_bInitializedTime)
     {
         gs_bInitializedTime = true;

src/Mod/Spreadsheet/Gui/Command.cpp

@@ -21,7 +21,9 @@
 #endif
 
 #include <time.h>
+#if defined(FC_OS_WIN32)
 #include <sys/timeb.h>
+#endif
 
 #include <Base/Exception.h>
 #include <Base/Interpreter.h>