blob: 72558df13e72d0eba11f3ac988045c2a900c2f3e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
--- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:25.084658287 +0100
+++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:18.660706180 +0100
@@ -133,9 +133,8 @@
/*! \def CPPUNIT_PLUGIN_IMPLEMENT_MAIN()
* \brief Implements the 'main' function for the plug-in.
*
- * This macros implements the main() function for dynamic library.
- * For example, WIN32 requires a DllMain function, while some Unix
- * requires a main() function. This macros takes care of the implementation.
+ * This macros implements the main() function for dynamic library
+ * on Unix for some weird reason.
*/
// Win32
@@ -149,12 +149,11 @@
#define NOMINMAX
#define BLENDFUNCTION void // for mingw & gcc
#include <windows.h>
+#if defined(OPTIONAL) // set within windows.h
+#undef OPTIONAL
+#endif
#endif
#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
- BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \
- { \
- return TRUE; \
- } \
typedef char __CppUnitPlugInImplementMainDummyTypeDef
// Unix
|
