[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/1.0.5-1

[Guido Günther]

The following commit has been merged in the master branch:
commit 910e1857da650c398fb23ea90a90eddab223c2f1
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu May 2 14:44:01 2013 +0200

    virthreadpthread: don't try to cast pthread_t to void*
    
    Fixes another build failure on kFreeBSD

diff --git a/debian/patches/series b/debian/patches/series
index 6148614..8eec335 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ Don-t-fail-if-we-can-t-setup-avahi.patch
 Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Debianize-systemd-service-files.patch
 Allow-xen-toolstack-to-find-it-s-binaries.patch
+virthreadpthread-don-t-try-to-cast-pthread_t-to-void.patch
diff --git a/debian/patches/virthreadpthread-don-t-try-to-cast-pthread_t-to-void.patch b/debian/patches/virthreadpthread-don-t-try-to-cast-pthread_t-to-void.patch
new file mode 100644
index 0000000..7264339
--- /dev/null
+++ b/debian/patches/virthreadpthread-don-t-try-to-cast-pthread_t-to-void.patch
@@ -0,0 +1,25 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 2 May 2013 12:03:18 +0200
+Subject: virthreadpthread: don't try to cast pthread_t to void*
+
+This fixes the build on kFreeBSD that otherwise fails with:
+
+util/virthreadpthread.c: In function 'virThreadSelfID':
+util/virthreadpthread.c:222:27: error: cast from function call of type 'pthread_t' to non-matching type 'void *' [-Werror=bad-function-cast]
+---
+ src/util/virthreadpthread.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/virthreadpthread.c b/src/util/virthreadpthread.c
+index b42b333..8d5e197 100644
+--- a/src/util/virthreadpthread.c
++++ b/src/util/virthreadpthread.c
+@@ -219,7 +219,7 @@ int virThreadSelfID(void)
+     tid = syscall(SYS_gettid);
+     return (int)tid;
+ #else
+-    return (int)(intptr_t)(void *)pthread_self();
++    return (int)(intptr_t)pthread_self();
+ #endif
+ }
+ 

-- 
Libvirt Debian packaging