diff options
Diffstat (limited to 'include/cppunit')
| -rw-r--r-- | include/cppunit/config/SelectDllLoader.h | 6 | ||||
| -rw-r--r-- | include/cppunit/plugin/TestPlugIn.h | 2 | ||||
| -rw-r--r-- | include/cppunit/tools/Algorithm.h | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/include/cppunit/config/SelectDllLoader.h b/include/cppunit/config/SelectDllLoader.h index 23df1f9..ac5e796 100644 --- a/include/cppunit/config/SelectDllLoader.h +++ b/include/cppunit/config/SelectDllLoader.h @@ -54,8 +54,12 @@ #elif defined(__BEOS__) #define CPPUNIT_HAVE_BEOS_DLL_LOADER 1 +// Is Unix platform and have shl_load() +#elif defined(CPPUNIT_HAVE_SHL_LOAD) +#define CPPUNIT_HAVE_UNIX_SHL_LOADER 1 + // Is Unix platform and have include <dlfcn.h> -#elif defined(CPPUNIT_HAVE_DLFCN_H) +#elif defined(CPPUNIT_HAVE_LIBDL) #define CPPUNIT_HAVE_UNIX_DLL_LOADER 1 // Otherwise, disable support for DllLoader diff --git a/include/cppunit/plugin/TestPlugIn.h b/include/cppunit/plugin/TestPlugIn.h index b2baf5b..f98bfe0 100644 --- a/include/cppunit/plugin/TestPlugIn.h +++ b/include/cppunit/plugin/TestPlugIn.h @@ -157,7 +157,7 @@ typedef CppUnitTestPlugIn *(*TestPlugInSignature)(); typedef char __CppUnitPlugInImplementMainDummyTypeDef // Unix -#elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) +#elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(HAVE_UNIX_SHL_LOADER) #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ int main( int argc, char *argv[] ) \ { \ diff --git a/include/cppunit/tools/Algorithm.h b/include/cppunit/tools/Algorithm.h index 572cf2c..e5746a2 100644 --- a/include/cppunit/tools/Algorithm.h +++ b/include/cppunit/tools/Algorithm.h @@ -20,4 +20,4 @@ removeFromSequence( SequenceType &sequence, CPPUNIT_NS_END -#endif // CPPUNIT_TOOLS_ALGORITHM_H_INCLUDED
\ No newline at end of file +#endif // CPPUNIT_TOOLS_ALGORITHM_H_INCLUDED |