File cppunit-1.12.1-windows.patch of Package mingw64-cppunit

Overview Repositories Revisions Requests Users Attributes Meta

File cppunit-1.12.1-windows.patch of Package mingw64-cppunit (Revision 8e684d2fc25e0187d0157e6edecf14ea)

Currently displaying revision 8e684d2fc25e0187d0157e6edecf14ea , Show latest

Only in cppunit-1.12.1: cppunit.spec
--- cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2007-01-12 05:54:34.000000000 +0100
+++ cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2011-06-30 13:03:15.184295853 +0200
@@ -133,36 +133,19 @@
 /*! \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 macro implements the main() function for dynamic library
+ * on Unix for some weird reason.
  */
 
 // Win32
 #if defined(CPPUNIT_HAVE_WIN32_DLL_LOADER)
-#if !defined(APIENTRY)
-#define WIN32_LEAN_AND_MEAN 
-#define NOGDI
-#define NOUSER
-#define NOKERNEL
-#define NOSOUND
-#define NOMINMAX
-#define BLENDFUNCTION void    // for mingw & gcc
-#include <windows.h>
-#endif
 #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
-  BOOL APIENTRY DllMain( HANDLE hModule,              \
-                         DWORD  ul_reason_for_call,   \
-                         LPVOID lpReserved )          \
-  {                                                   \
-      return TRUE;                                    \
-  }                                                   \
   typedef char __CppUnitPlugInImplementMainDummyTypeDef
 
 // Unix
 #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
 #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
-  int main( int argc, char *argv[] )                  \
+  int main( int, char *[] )                           \
   {                                                   \
     return 0;                                         \
   }                                                   \
--- cppunit-1.12.1/include/cppunit/TestAssert.h	2007-02-24 23:17:18.000000000 +0100
+++ cppunit-1.12.1/include/cppunit/TestAssert.h	2011-06-30 13:03:15.184295853 +0200
@@ -76,7 +76,7 @@
        const int precision = 15;
 #endif  // #ifdef DBL_DIG
        char buffer[128];
-#ifdef __STDC_SECURE_LIB__ // Use secure version with visual studio 2005 to avoid warning.
+#if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning.
        sprintf_s(buffer, sizeof(buffer), "%.*g", precision, x); 
 #else	
        sprintf(buffer, "%.*g", precision, x); 
Only in cppunit-1.12.1: mingw32-config.cache

Places

File cppunit-1.12.1-windows.patch of Package mingw64-cppunit (Revision 8e684d2fc25e0187d0157e6edecf14ea)

Places