[SCM] FreeCAD packaging branch, master, updated. debian/0.9.2646.5.dfsg-1-17-g0286383

[Teemu Ikonen]

The following commit has been merged in the master branch:
commit a3f687a07a11b2fadabca482d0bb122fd41c72c1
Author: Teemu Ikonen <tpikonen at gmail.com>
Date:   Fri Aug 13 16:59:13 2010 +0200

    Add kFreeBSD portability fixes.
    
    Thanks to Petr Salinger <Petr.Salinger at seznam.cz> for the patch
    (closes: #592461).

diff --git a/configure b/configure
index d24879d..cbe7e92 100755
--- a/configure
+++ b/configure
@@ -18029,7 +18029,7 @@ case $host_os in
   darwin*)
     GL_LIBS="-Wl,-F/System/Library/Frameworks -Wl,-framework,OpenGL"
     ;;
-  linux*)
+  linux*|kfreebsd*-gnu*)
     GL_LIBS="-lGL -lGLU"
     ;;
 esac
diff --git a/src/FCConfig.h b/src/FCConfig.h
index 61c6f3e..99fb4e9 100644
--- a/src/FCConfig.h
+++ b/src/FCConfig.h
@@ -66,7 +66,7 @@
 #	ifndef FC_OS_WIN32
 #	define FC_OS_WIN32
 #	endif
-#elif defined(linux) || defined(__linux) || defined(__linux__)
+#elif defined(linux) || defined(__linux) || defined(__linux__) || defined(__GLIBC__)
 #	ifndef FC_OS_LINUX
 #	define FC_OS_LINUX
 #	endif
diff --git a/src/Mod/Sketcher/App/sketchflat/sketch.h b/src/Mod/Sketcher/App/sketchflat/sketch.h
index d060c04..6e8ede7 100644
--- a/src/Mod/Sketcher/App/sketchflat/sketch.h
+++ b/src/Mod/Sketcher/App/sketchflat/sketch.h
@@ -60,10 +60,10 @@ typedef unsigned short   WORD;
 
 inline DWORD GetTickCount()
 {
-    //FIXME: Must be tested
-    struct sysinfo si;
-    if (sysinfo(&si) == 0) return (si.uptime * 1000);
-    else return 1000;
+    struct timeval tv;
+
+    gettimeofday(&tv, NULL);
+    return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
 }
 
 #elif defined(FC_OS_MACOSX)

-- 
FreeCAD packaging