Resolves: sf#2912630 unused argument warnings

This commit is contained in:
Caolán McNamara 2011-10-05 15:58:13 +01:00
parent 350c082bea
commit 721d701981
2 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,22 @@
--- cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2007-01-12 05:54:34.000000000 +0100
+++ 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; \
} \

View File

@ -1,6 +1,6 @@
Name: cppunit
Version: 1.12.1
Release: 5%{?dist}
Release: 6%{?dist}
Summary: C++ unit testing framework
# no license in files
@ -10,6 +10,8 @@ Url: http://cppunit.sourceforge.net/
Source: http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz
Patch0: cppunit-1.12.0-nolibdir.patch
Patch1: cppunit-msg.patch
#https://sourceforge.net/tracker/?func=detail&aid=2912630&group_id=11795&atid=311795
Patch2: cppunit-warnings-sf2912630.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen, graphviz
@ -46,6 +48,7 @@ for file in THANKS ChangeLog NEWS; do
mv ${file}.utf8 $file
done
%patch1 -p1 -b .nomsg
%patch2 -p1 -b .warnings-sf2912630
%build
export LDFLAGS=-ldl
@ -100,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
%doc doc/html
%changelog
* Wed Oct 05 2011 Caolán McNamara <caolanm@redhat.com> - 1.12.1-6
- add sf#2912630 fix for unused argument warnings
* Tue Jun 28 2011 Steven M. Parrish <smparrish@gmail.com> - 1.12.1-5
- Fix for bug 452340