[SCM] dpkg's main repository branch, master, updated. 1.16.1.2-141-gd7c001a

[Guillem Jover]

The following commit has been merged in the master branch:
commit 31f89e02c693f41d9f385e04756802380e645de1
Author: Guillem Jover <guil...@debian.org>
Date:   Thu Dec 8 21:17:49 2011 +0100

    libdpkg: Rename arch_type enum to dpkg_arch_type

diff --git a/lib/dpkg/arch.c b/lib/dpkg/arch.c
index 669f15c..3a77e17 100644
--- a/lib/dpkg/arch.c
+++ b/lib/dpkg/arch.c
@@ -93,7 +93,7 @@ static struct dpkg_arch arch_item_native = {
 static struct dpkg_arch *arch_list = &arch_item_native;
 
 static struct dpkg_arch *
-dpkg_arch_new(const char *name, enum arch_type type)
+dpkg_arch_new(const char *name, enum dpkg_arch_type type)
 {
        struct dpkg_arch *new;
 
@@ -119,7 +119,7 @@ struct dpkg_arch *
 dpkg_arch_find(const char *name)
 {
        struct dpkg_arch *arch, *last_arch = NULL;
-       enum arch_type type;
+       enum dpkg_arch_type type;
 
        if (name == NULL || name[0] == '\0')
                return &arch_item_none;
diff --git a/lib/dpkg/arch.h b/lib/dpkg/arch.h
index 9d5fa7e..047bd27 100644
--- a/lib/dpkg/arch.h
+++ b/lib/dpkg/arch.h
@@ -30,7 +30,7 @@ DPKG_BEGIN_DECLS
 struct dpkg_arch {
        struct dpkg_arch *next;
        const char *name;
-       enum arch_type {
+       enum dpkg_arch_type {
                arch_none,
                arch_all,
                arch_native,

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org