diff options
| author | Baptiste Lepilleur <gaiacrtn@free.fr> | 2004-06-17 17:08:17 +0000 |
|---|---|---|
| committer | Baptiste Lepilleur <gaiacrtn@free.fr> | 2004-06-17 17:08:17 +0000 |
| commit | 5615ce97bd9c465f6ae0d5ca0641ec5d7f0c5457 (patch) | |
| tree | 09b00fd6c5a3fba23c2dd0bdac96297e7982ff6e /include/cppunit | |
| parent | 3217c0e4adaaade5dfa18000fdce28c1a901390a (diff) | |
| download | cppunit-5615ce97bd9c465f6ae0d5ca0641ec5d7f0c5457.tar.gz | |
Include/cppunit/Portability.
include/cppunit/Portability.h:
* include/cppunit/plugin/TestPlugIn.h: fixed report compilation issue
with mingw & cygwin. WIN32 is now always defined if _WIN32 is defined.
Bug #945737 & #930338.
Diffstat (limited to 'include/cppunit')
| -rw-r--r-- | include/cppunit/Portability.h | 6 | ||||
| -rw-r--r-- | include/cppunit/plugin/TestPlugIn.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/cppunit/Portability.h b/include/cppunit/Portability.h index b2080e0..201c092 100644 --- a/include/cppunit/Portability.h +++ b/include/cppunit/Portability.h @@ -1,6 +1,10 @@ #ifndef CPPUNIT_PORTABILITY_H #define CPPUNIT_PORTABILITY_H +#if defined(_WIN32) and !defined(WIN32) +# define WIN32 1 +#endif + /* include platform specific config */ #if defined(__BORLANDC__) # include <cppunit/config/config-bcb5.h> @@ -12,7 +16,7 @@ // Version number of package #ifndef CPPUNIT_VERSION -#define CPPUNIT_VERSION "1.9.10" +#define CPPUNIT_VERSION "1.10.1" #endif #include <cppunit/config/CppUnitApi.h> // define CPPUNIT_API & CPPUNIT_NEED_DLL_DECL diff --git a/include/cppunit/plugin/TestPlugIn.h b/include/cppunit/plugin/TestPlugIn.h index 3a6f908..1214e12 100644 --- a/include/cppunit/plugin/TestPlugIn.h +++ b/include/cppunit/plugin/TestPlugIn.h @@ -145,6 +145,7 @@ typedef CppUnitTestPlugIn *(*TestPlugInSignature)(); #define NOKERNEL #define NOSOUND #define NOMINMAX +#define BLENDFUNCTION void // for mingw & gcc #include <windows.h> #endif #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ |