[libcvd-members] libcvd/cvd_src cvd_timer.cc i686/convolve_gauss...

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        08/08/11 21:11:24

Modified files:
        cvd_src        : cvd_timer.cc 
        cvd_src/i686   : convolve_gaussian.cc 

Log message:
        MingW fixes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/cvd_timer.cc?cvsroot=libcvd&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/i686/convolve_gaussian.cc?cvsroot=libcvd&r1=1.5&r2=1.6

Patches:
Index: cvd_timer.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/cvd_timer.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- cvd_timer.cc        12 Jun 2008 13:04:14 -0000      1.9
+++ cvd_timer.cc        11 Aug 2008 21:11:24 -0000      1.10
@@ -28,7 +28,7 @@
 #include "cvd/timer.h"
 #include <iostream>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
 #include "Win32/win32.h"
 #else
 #include <sys/time.h>  //gettimeofday

Index: i686/convolve_gaussian.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/i686/convolve_gaussian.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- i686/convolve_gaussian.cc   15 Jul 2008 00:47:42 -0000      1.5
+++ i686/convolve_gaussian.cc   11 Aug 2008 21:11:24 -0000      1.6
@@ -5,7 +5,7 @@
 
 namespace CVD {
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
 inline __m128 operator+( const __m128 & a, const __m128 & b){
     return _mm_add_ps(a,b);
 }