summaryrefslogtreecommitdiff
path: root/cppunit/warnings.patch
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2009-12-11 14:29:59 +0100
committersb <sb@openoffice.org>2009-12-11 14:29:59 +0100
commit8efa42c387b62e668e70502928492ee4ef32d44e (patch)
tree1236597801873a7360f644487728a6265674fce2 /cppunit/warnings.patch
parentf66a3fe05330baac519241310d81e017cacb3e42 (diff)
sb118: Replace (heavily modified) CppUnit 1.8.0 with (unmodified) latest 1.12.1.
- Old modifications were necessary for testshl2, which has simply been excluded from the build for now. - Tests in basebmp, basegfx, o3tl (that are executed during build) have been converted from using modified CppUnit/testshl2 to using unmodified CppUnit. - CppUnit's DllPlugInTester has problems with OOo tests on Windows, see #i107562#, so for now a new cppunittester from sal is used instead.
Diffstat (limited to 'cppunit/warnings.patch')
-rw-r--r--cppunit/warnings.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/cppunit/warnings.patch b/cppunit/warnings.patch
new file mode 100644
index 000000000000..39e804aff7f0
--- /dev/null
+++ b/cppunit/warnings.patch
@@ -0,0 +1,22 @@
+--- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2007-01-12 05:54:34.000000000 +0100
++++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2009-12-02 15:33:29.639857272 +0100
+@@ -151,9 +151,7 @@
+ #include <windows.h>
+ #endif
+ #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
+- BOOL APIENTRY DllMain( HANDLE hModule, \
+- DWORD ul_reason_for_call, \
+- LPVOID lpReserved ) \
++ BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \
+ { \
+ return TRUE; \
+ } \
+@@ -162,7 +160,7 @@
+ // Unix
+ #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
+ #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
+- int main( int argc, char *argv[] ) \
++ int main( int, char *[] ) \
+ { \
+ return 0; \
+ } \