--- misc/build/cppunit-1.12.1/configure +++ misc/build/cppunit-1.12.1/configure @@ -23273,7 +23273,7 @@ { echo "$as_me:$LINENO: result: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5 echo "${ECHO_T}creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6; } if test -f $ac_prefix_conf_INP ; then - $as_dirname -- /* automatically generated */ || + $as_dirname -- '/* automatically generated */' || $as_expr X/* automatically generated */ : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X/* automatically generated */ : 'X\(//\)[^/]' \| \ X/* automatically generated */ : 'X\(//\)$' \| \ @@ -23318,5 +23318,5 @@ echo "$as_me: error: input file $ac_prefix_conf_IN does not exist, skip generating $ac_prefix_conf_OUT" >&2;} { (exit 1); exit 1; }; } fi - rm -f conftest.* + rm -f -r conftest.* fi --- misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h +++ misc/build/cppunit-1.12.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 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() \ ion value='distro/collabora/cd-5.3'>distro/collabora/cd-5.3 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/include/comphelper/SelectionMultiplex.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-19 12:51:29 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-20 07:05:25 +0000
commit1b62841b1859ae3443e2bf1ebe99ec3d6afb6cc2 (patch)
treee3b7af8a34c55d7aad95752ad5d642a271523d08 /include/comphelper/SelectionMultiplex.hxx
parentb1659c95b0620cfd1291f889eae767757f696ae1 (diff)
com::sun::star->css in include/comphelper
Change-Id: Ice569b724732da1fd67a18a4ccf2f92f530cd689 Reviewed-on: https://gerrit.libreoffice.org/19459 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>