merged tag ooo/DEV300_m102
[LibreOffice.git] / cppunit / warnings.patch
blob39e804aff7f03752855809d799e9e5868b703b62
1 --- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2007-01-12 05:54:34.000000000 +0100
2 +++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2009-12-02 15:33:29.639857272 +0100
3 @@ -151,9 +151,7 @@
4 #include <windows.h>
5 #endif
6 #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
7 - BOOL APIENTRY DllMain( HANDLE hModule, \
8 - DWORD ul_reason_for_call, \
9 - LPVOID lpReserved ) \
10 + BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \
11 { \
12 return TRUE; \
13 } \
14 @@ -162,7 +160,7 @@
15 // Unix
16 #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
17 #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
18 - int main( int argc, char *argv[] ) \
19 + int main( int, char *[] ) \
20 { \
21 return 0; \
22 } \