[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, bpo-etch, updated. debian/0.4.6-10-16-g4e730fe

[Guido Guenther]

The following commit has been merged in the bpo-etch branch:
commit c720dc51f83a9b2536141840ff4c4196976f7908
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Dec 20 18:07:24 2008 +0100

    fix compilation with etch's gcc 4.1

diff --git a/debian/patches/0001-drop-unused-anonymous-unions-and-empty-structs.patch b/debian/patches/0001-drop-unused-anonymous-unions-and-empty-structs.patch
new file mode 100644
index 0000000..3a28bdc
--- /dev/null
+++ b/debian/patches/0001-drop-unused-anonymous-unions-and-empty-structs.patch
@@ -0,0 +1,47 @@
+From 530b739cceb28cb385e9693946441f51d3b27e60 Mon Sep 17 00:00:00 2001
+From: Guido Günther <agx at sigxcpu.org>
+Date: Sat, 20 Dec 2008 17:21:26 +0100
+Subject: [PATCH] drop unused anonymous unions and empty structs
+
+gcc 4.1 can't cope with them
+---
+ src/domain_conf.h |   17 ++---------------
+ 1 files changed, 2 insertions(+), 15 deletions(-)
+
+diff --git a/src/domain_conf.h b/src/domain_conf.h
+index 632e5ad..ee0a488 100644
+--- a/src/domain_conf.h
++++ b/src/domain_conf.h
+@@ -301,27 +301,14 @@ struct _virDomainHostdevDef {
+     union {
+         struct {
+             int type; /* enum virDomainHostdevBusType */
+-            union {
+-                struct {
++            struct {
+                     unsigned bus;
+                     unsigned device;
+
+                     unsigned vendor;
+                     unsigned product;
+-                } usb;
+-                struct {
+-                     unsigned domain;
+-                     unsigned bus;
+-                     unsigned slot;
+-                     unsigned function;
+-                } pci;
+-            };
++            } usb;
+         } subsys;
+-        struct {
+-            /* TBD: struct capabilities see:
+-             * https://www.redhat.com/archives/libvir-list/2008-July/msg00429.html
+-             */
+-        } caps;
+     } source;
+     char* target;
+     virDomainHostdevDefPtr next;
+--
+1.5.6.5
+
diff --git a/debian/patches/series b/debian/patches/series
index f10e54d..d052ab2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0010-raise-error-on-invalid-volume-format.patch
 0011-Fix-missing-read-only-access-checks-CVE-2008-5086.patch
 0005-include-bits-siginfo.h-for-siginfo_t.patch
+0001-drop-unused-anonymous-unions-and-empty-structs.patch

-- 
Libvirt debian packaging