diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-17 01:32:29 +0200 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2013-10-17 17:17:22 +0000 |
| commit | 7223027a3a7e6599e387559d85f1eaebf3bbbd6c (patch) | |
| tree | 10017f4f62c300eef573e6ac73dba9271c824855 /external/cppunit/disable-dynloading.patch | |
| parent | 894f5e46a6d72d3cfc3731c49a5f01626c6b95db (diff) | |
fdo#70393: move cppunit to a subdir of external
Change-Id: I96ab796757af0c6c6741059b35fcaeefc2bf4507
Reviewed-on: https://gerrit.libreoffice.org/6286
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'external/cppunit/disable-dynloading.patch')
| -rw-r--r-- | external/cppunit/disable-dynloading.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/external/cppunit/disable-dynloading.patch b/external/cppunit/disable-dynloading.patch new file mode 100644 index 000000000000..a9aa37f6f45d --- /dev/null +++ b/external/cppunit/disable-dynloading.patch @@ -0,0 +1,25 @@ +--- build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h ++++ misc/build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h +@@ -106,7 +106,9 @@ + * CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void); + * \endcode + */ ++#ifndef CPPUNIT_PLUGIN_EXPORTED_NAME + #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn ++#endif + + /*! \brief Type of the function exported by a plug-in. + * \ingroup WritingTestPlugIn +@@ -143,6 +143,12 @@ + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ + typedef char __CppUnitPlugInImplementMainDummyTypeDef + ++// Actually this is for iOS and Android where we build the cppunit tests libraries ++// as plain archives and just link them statically into test fixture programs, ++// and don't want any stinking duplicate main(), but shouldn't hurt for MacOSX either. ++#elif defined(__APPLE__) || defined(__ANDROID__) ++#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ ++ typedef char __CppUnitPlugInImplementMainDummyTypeDef + // Unix + #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER) + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ |