office-gobmx/cppunit/windows.patch
Tor Lillqvist 138cf77e51 Drop the unnecessary DllMain from CPPUNIT_PLUGIN_IMPLEMENT_MAIN()
It caused compilation errors even thanks to our workarounds for BOOL
clashes.
2011-02-08 13:53:25 +02:00

30 lines
1.2 KiB
Diff

--- 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