File: disable-dynloading.patch

package info (click to toggle)

libreoffice 1%3A4.2.5-1~bpo70%2B1

links: PTS, VCS
area: main
in suites: wheezy-backports
size: 2,610,340 kB
sloc: cpp: 4,073,558; java: 376,402; xml: 229,507; ansic: 77,459; perl: 34,757; python: 29,421; objc: 17,869; yacc: 12,574; sh: 9,058; makefile: 8,891; cs: 6,620; lex: 2,267; asm: 1,514; pascal: 910; awk: 807; lisp: 115; php: 104; csh: 46; sed: 5

file content (25 lines) | stat: -rw-r--r-- 1,120 bytes

parent folder | download | duplicates (11)

--- 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()               \