From 0e90e6b78e58aacd964a57290481410728b8b256 Mon Sep 17 00:00:00 2001
From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Fri, 6 Jan 2012 22:08:09 +0400
Subject: [PATCH] Support multi-valued enum attributes.

---
 library/include/DataDefs.h | 7 +++++++
 library/xml                | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h
index ff61d08f5..5d942c46a 100644
--- a/library/include/DataDefs.h
+++ b/library/include/DataDefs.h
@@ -135,6 +135,12 @@ namespace DFHack
         const char *name;
         int size;
     };
+    
+    template<class T>
+    struct enum_list_attr {
+        int size;
+        const T *items;
+    };
 
     DFHACK_EXPORT std::string bitfieldToString(const void *p, int size, const bitfield_item_info *items);
 
@@ -150,6 +156,7 @@ namespace df
     using DFHack::virtual_identity;
     using DFHack::virtual_class;
     using DFHack::bitfield_item_info;
+    using DFHack::enum_list_attr;
     using DFHack::BitArray;
 
     template<class T>
diff --git a/library/xml b/library/xml
index d03375ddb..e5713a6ad 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit d03375ddbd695fda2deb42dd13aa352efccebc60
+Subproject commit e5713a6add0c21477d3bfa5e228ecdb4b3a2c33d