Include/cppunit/config-msvc6.

include/cppunit/config-msvc6.h:
* include/cppunit/Portability.h
* include/cppunit/extensions/TestFactoryRegistry.h
* include/cppunit/TestResult.h
* include/cppunit/TestResultCollector.h
* include/cppunit/TestSuite.h
* include/cppunit/TextTestRunner.h
* include/cppunit/XmlOutputter.h: removed warning when compiling CppUnit as DLL.

* src/cppunit/DllMain.cpp: added some defines to speed up compilation a bit.

7 files changed, 66 insertions, 10 deletions

diff --git a/include/cppunit/Portability.h b/include/cppunit/Portability.h
index 3bb34a9..902de56 100644
--- a/include/cppunit/Portability.h
+++ b/include/cppunit/Portability.h
@@ -82,5 +82,4 @@
 #endif
 #endif
 
-
 #endif // CPPUNIT_PORTABILITY_H
diff --git a/include/cppunit/TestResult.h b/include/cppunit/TestResult.h
index 162095d..4d504e2 100644
--- a/include/cppunit/TestResult.h
+++ b/include/cppunit/TestResult.h
@@ -1,6 +1,13 @@
 #ifndef CPPUNIT_TESTRESULT_H
 #define CPPUNIT_TESTRESULT_H
 
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
 #include <cppunit/SynchronizedObject.h>
 #include <deque>
 
@@ -68,8 +75,14 @@ private:
   TestResult &operator =( const TestResult &other );
 };
 
+
 } // namespace CppUnit
 
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
 #endif // CPPUNIT_TESTRESULT_H
 
 
diff --git a/include/cppunit/TestResultCollector.h b/include/cppunit/TestResultCollector.h
index b20385f..f094f0a 100644
--- a/include/cppunit/TestResultCollector.h
+++ b/include/cppunit/TestResultCollector.h
@@ -1,6 +1,13 @@
 #ifndef CPPUNIT_TESTRESULTCOLLECTOR_H
 #define CPPUNIT_TESTRESULTCOLLECTOR_H
 
+#include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
 #include <cppunit/TestSucessListener.h>
 #include <deque>
 
@@ -69,4 +76,9 @@ private:
 } //  namespace CppUnit
 
 
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+
 #endif  // CPPUNIT_TESTRESULTCOLLECTOR_H
diff --git a/include/cppunit/TestSuite.h b/include/cppunit/TestSuite.h
index 369f89d..031f597 100644
--- a/include/cppunit/TestSuite.h
+++ b/include/cppunit/TestSuite.h
@@ -2,6 +2,12 @@
 #define CPPUNIT_TESTSUITE_H
 
 #include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
 #include <cppunit/Test.h>
 #include <vector>
 #include <string>
@@ -62,4 +68,9 @@ private:
 
 } // namespace CppUnit
 
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
 #endif // CPPUNIT_TESTSUITE_H
diff --git a/include/cppunit/XmlOutputter.h b/include/cppunit/XmlOutputter.h
index 55157ef..92acc29 100644
--- a/include/cppunit/XmlOutputter.h
+++ b/include/cppunit/XmlOutputter.h
@@ -2,6 +2,12 @@
 #define CPPUNIT_XMLTESTRESULTOUTPUTTER_H
 
 #include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
 #include <cppunit/Outputter.h>
 #include <deque>
 #include <iostream>
@@ -121,4 +127,9 @@ private:
 
 }  // namespace CppUnit
 
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
 #endif  // CPPUNIT_XMLTESTRESULTOUTPUTTER_H
diff --git a/include/cppunit/config-msvc6.h b/include/cppunit/config-msvc6.h
index da828b1..c5ad455 100644
--- a/include/cppunit/config-msvc6.h
+++ b/include/cppunit/config-msvc6.h
@@ -38,23 +38,23 @@
 #define CPPUNIT_PACKAGE  "cppunit" 
 #endif
 
-// define CPPUNIT_DLL when linking to CppUnit dll.
-#ifdef CPPUNIT_DLL
 #undef CPPUNIT_API
-#define CPPUNIT_API __declspec(dllimport)
-#undef CPPUNIT_NEED_DLL_DECL
-#define CPPUNIT_NEED_DLL_DECL 1
-#endif
 
 // define CPPUNIT_DLL_BUILD when building CppUnit dll.
 #ifdef CPPUNIT_BUILD_DLL
-#undef CPPUNIT_API
 #define CPPUNIT_API __declspec(dllexport)
+#endif
+
+// define CPPUNIT_DLL when linking to CppUnit dll.
+#ifdef CPPUNIT_DLL
+#define CPPUNIT_API __declspec(dllimport)
+#endif
+
+#ifdef CPPUNIT_API
 #undef CPPUNIT_NEED_DLL_DECL
 #define CPPUNIT_NEED_DLL_DECL 1
 #endif
 
-
 #if _MSC_VER > 1000     // VC++
 #pragma warning( disable : 4786 )   // disable warning debug symbol > 255...
 #endif // _MSC_VER > 1000
diff --git a/include/cppunit/extensions/TestFactoryRegistry.h b/include/cppunit/extensions/TestFactoryRegistry.h
index 5583d1a..1484977 100644
--- a/include/cppunit/extensions/TestFactoryRegistry.h
+++ b/include/cppunit/extensions/TestFactoryRegistry.h
@@ -2,6 +2,12 @@
 #define CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H
 
 #include <cppunit/Portability.h>
+
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( push )
+#pragma warning( disable: 4251 )  // X needs to have dll-interface to be used by clients of class Z
+#endif
+
 #include <cppunit/extensions/TestFactory.h>
 #include <map>
 #include <string>
@@ -75,8 +81,12 @@ private:
 };
 
 
-
 }  // namespace CppUnit
 
 
+#if CPPUNIT_NEED_DLL_DECL
+#pragma warning( pop )
+#endif
+
+
 #endif  // CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H