--- OpenCV-2.1.0.orig/src/highgui/loadsave.cpp	2010-04-05 21:24:44.000000000 -0400

+++ OpenCV-2.1.0/src/highgui/loadsave.cpp	2010-05-08 23:35:11.784265422 -0400

@@ -330,7 +330,7 @@

     if( !decoder->readHeader() )

     {

         if( filename )

-            unlink(filename);

+            remove(filename);

         return 0;

     }

@@ -372,7 +372,7 @@

     bool code = decoder->readData( *data );

     if( filename )

-        unlink(filename);

+        remove(filename);

     if( !code )

     {

@@ -437,7 +437,7 @@

         fseek( f, 0, SEEK_SET );

         buf.resize(fread( &buf[0], 1, buf.size(), f ));

         fclose(f);

-        unlink(filename);

+        remove(filename);

     }

     return code;

 }

--- OpenCV-2.1.0.orig/tests/ml/src/slmltests.cpp	2010-04-05 21:24:46.000000000 -0400

+++ OpenCV-2.1.0/tests/ml/src/slmltests.cpp	2010-05-08 23:25:37.963854491 -0400

@@ -101,8 +101,8 @@

     f1.close();

     f2.close();

     // delete temporary files

-    unlink( fname1 );

-    unlink( fname2 );

+    remove( fname1 );

+    remove( fname2 );

     // 2. compare responses

     CV_Assert( test_resps1.size() == test_resps2.size() );

--- OpenCV-2.1.0.orig/tests/cv/src/anearestneighbors.cpp	2010-04-05 21:24:45.000000000 -0400

+++ OpenCV-2.1.0/tests/cv/src/anearestneighbors.cpp	2010-05-08 23:55:49.017604944 -0400

@@ -72,6 +72,12 @@

     virtual void releaseModel() = 0;

 };

+const int NearestNeighborTest::minValue;

+const int NearestNeighborTest::maxValue;

+const int NearestNeighborTest::dims;

+const int NearestNeighborTest::featuresCount;

+const int NearestNeighborTest::K;

+

 int NearestNeighborTest::checkGetPoins( const Mat& )

 {

    return CvTS::OK;

@@ -510,7 +516,7 @@

     index->save( filename );

     createIndex( data, SavedIndexParams(filename));

-    unlink( filename );

+    remove( filename );

 }

 CV_LSHTest lsh_test;

--- OpenCV-2.1.0.orig/tests/cxcore/src/aio.cpp	2010-04-05 21:24:46.000000000 -0400

+++ OpenCV-2.1.0/tests/cxcore/src/aio.cpp	2010-05-08 23:36:12.779262533 -0400

@@ -423,11 +423,7 @@

         }

         fs.release();

-        #ifdef _MSC_VER

-            _unlink(filename);

-        #else

-            unlink(filename);

-        #endif

+        remove(filename);

     }

 }