commit 655be581fb8c65248538d4a29443da973cfcfe7e
Author: Marcin Banasiak <[email protected]>
Date: Fri Feb 15 01:05:37 2013 +0100
Rename aligned_alloc to avoid conflicting types error
tiobench-fix-conflicting-types.patch | 20 ++++++++++++++++++++
tiobench.spec | 2 ++
2 files changed, 22 insertions(+)
---
diff --git a/tiobench.spec b/tiobench.spec
index 368c890..823c326 100644
--- a/tiobench.spec
+++ b/tiobench.spec
@@ -9,6 +9,7 @@ Group: Applications/System
Source0: http://dl.sourceforge.net/tiobench/%{name}-%{version}.tar.gz
# Source0-md5: bf485bf820e693c79e6bd2a38702a128
Patch0: %{name}-format-security.patch
+Patch1: %{name}-fix-conflicting-types.patch
URL: http://sf.net/projects/tiobench/
BuildRequires: rpm-perlprov >= 4.1-13
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -22,6 +23,7 @@ Przenośny, potężny, w pełni wątkowy program testujący
wydajność I/O.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__make} \
diff --git a/tiobench-fix-conflicting-types.patch
b/tiobench-fix-conflicting-types.patch
new file mode 100644
index 0000000..c21646f
--- /dev/null
+++ b/tiobench-fix-conflicting-types.patch
@@ -0,0 +1,20 @@
+--- tiobench-0.3.3/tiotest.c.aligned 2013-02-15 01:01:30.377497578 +0100
++++ tiobench-0.3.3/tiotest.c 2013-02-15 01:02:11.170996694 +0100
+@@ -31,7 +31,7 @@ static const char* versionStr = "tiotest
+ */
+ ArgumentOptions args;
+
+-static void * aligned_alloc(ssize_t size)
++static void * tio_aligned_alloc(ssize_t size)
+ {
+ caddr_t a;
+ a = mmap((caddr_t )0, size,
+@@ -281,7 +281,7 @@ void initialize_test( ThreadTest *d )
+ pthread_attr_setscope(&(d->threads[i].thread_attr),
+ PTHREAD_SCOPE_SYSTEM);
+
+- d->threads[i].buffer = aligned_alloc( d->threads[i].blockSize );
++ d->threads[i].buffer = tio_aligned_alloc(
d->threads[i].blockSize );
+ if( d->threads[i].buffer == NULL )
+ {
+ perror("Error allocating memory");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tiobench.git/commitdiff/655be581fb8c65248538d4a29443da973cfcfe7e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
