external/cppunit/disable-dynloading.patch

   1 --- build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h
   2 +++ misc/build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h
   3 @@ -106,7 +106,9 @@
   4   * CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void);
   5   * \endcode
   6   */
   7 +#ifndef CPPUNIT_PLUGIN_EXPORTED_NAME
   8  #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn
   9 +#endif
  10
  11  /*! \brief Type of the function exported by a plug-in.
  12   * \ingroup WritingTestPlugIn
  13 @@ -143,6 +143,12 @@
  14  #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
  15    typedef char __CppUnitPlugInImplementMainDummyTypeDef
  16
  17 +// Actually this is for iOS and Android where we build the cppunit tests libraries
  18 +// as plain archives and just link them statically into test fixture programs,
  19 +// and don't want any stinking duplicate main(), but shouldn't hurt for MacOSX either.
  20 +#elif defined(__APPLE__) || defined(__ANDROID__)
  21 +#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
  22 +  typedef char __CppUnitPlugInImplementMainDummyTypeDef
  23  // Unix
  24  #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
  25  #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \