diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-14 14:31:40 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-09-14 14:39:25 +0300 |
| commit | 24c66413176cdb64eccb21e204bc61c933f2732d (patch) | |
| tree | a98b80c0467091f5fa299f2d0a7c6dca156751bf /cppunit/ios.patch | |
| parent | 085446cf8501f2b820628b106fdb5dd4c375d13f (diff) | |
Adapt for DISABLE_DYNLOADING possibility also for Android
Change-Id: Iecc8c35b5b2235bc3408f2ecf3969317ac8bf679
Diffstat (limited to 'cppunit/ios.patch')
| -rw-r--r-- | cppunit/ios.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/cppunit/ios.patch b/cppunit/ios.patch index 2a0cba1677b7..55ee65ca17ff 100644 --- a/cppunit/ios.patch +++ b/cppunit/ios.patch @@ -16,28 +16,3 @@ - rm -f conftest.* + rm -f -r conftest.* fi ---- misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h -+++ misc/build/cppunit-1.13.0/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 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__) -+#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() \ |