2 files changed, 4 insertions, 38 deletions
diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp
index 0725f57f..6724d338 100644
--- a/akregator/src/mk4storage/metakit/tests/regress.cpp
+++ b/akregator/src/mk4storage/metakit/tests/regress.cpp
@@ -15,11 +15,6 @@
   #endif
 #endif
 
-#if __profile__
-  #define q4_MWCW_PROFILER 1
-  #include <profiler.h>
-#endif
-
 #if q4_NOTHROW
   const char* msg;
 #endif
@@ -56,10 +51,6 @@ main()
     DebugNewForgetLeaks();
   #endif
 
-#if q4_MWCW_PROFILER
-  if (!ProfilerInit(collectDetailed, bestTimeBase, 20, 5))
-  {
-#endif
     TestBasics1();
     TestBasics2();
     TestNotify();
@@ -77,12 +68,6 @@ main()
     TestMapped();
     TestLimits();
 
-#if q4_MWCW_PROFILER
-    ProfilerDump("\pRegress.prof");
-    ProfilerTerm();
-  }
-#endif
-
   #if defined (_DEBUG)
     fputs("\nPress return... ", stderr);
     getchar();
@@ -226,18 +211,14 @@ int StartTest(int mask_, const char* name_, const char* desc_)
     #if q4_MFC && defined(_DEBUG)
       TRACE("%s - %-40s *** DISABLED ***\n", name_, desc_);
     #endif
-    #if !q4_MWCW_PROFILER
-      fprintf(stderr, "%s - %-40s   *** DISABLED ***\n", name_, desc_);
-    #endif
+    fprintf(stderr, "%s - %-40s   *** DISABLED ***\n", name_, desc_);
     return false;
   }
   
   #if q4_MFC && defined(_DEBUG)
     TRACE("%s - %s\n", name_, desc_);
   #endif
-  #if !q4_MWCW_PROFILER
-    fprintf(stderr, "%s - %s\n", name_, desc_);
-  #endif
+  fprintf(stderr, "%s - %s\n", name_, desc_);
 
   char buffer [50];
   sprintf(buffer, "%s%s.txt", TESTDIR, name_);
@@ -254,16 +235,12 @@ int StartTest(int mask_, const char* name_, const char* desc_)
 
 void CatchMsg(const char* msg)
 {
-  #if !q4_MWCW_PROFILER
-    fprintf(stderr, "\t%s\n", msg);
-  #endif
+  fprintf(stderr, "\t%s\n", msg);
   printf("*** %s ***\n", msg);
 }
 
 void CatchOther()
 {
-  #if !q4_MWCW_PROFILER
-    fputs("\tException!\n", stderr);
-  #endif
+  fputs("\tException!\n", stderr);
   printf("*** Exception ***\n");
 }
diff --git a/akregator/src/mk4storage/metakit/tests/regress.h b/akregator/src/mk4storage/metakit/tests/regress.h
index b5611e57..1574bc0d 100644
--- a/akregator/src/mk4storage/metakit/tests/regress.h
+++ b/akregator/src/mk4storage/metakit/tests/regress.h
@@ -132,14 +132,3 @@ extern void TestStores2();
 extern void TestStores3();
 extern void TestStores4();
 extern void TestStores5();
-
-  //  The Borland C++ RTL does not want file handle objects to cross
-  //  DLL boundaries, so we use special fopen/fclose hooks in the DLL.
-
-#if defined (__BORLANDC__) // this assumes Metakit is in a DLL!
-extern FILE* f4_FileOpenInDLL(const char*, const char*);
-extern int f4_FileCloseInDLL(FILE*);
-
-#define fopen f4_FileOpenInDLL
-#define fclose f4_FileCloseInDLL
-#endif