summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-01-17 08:57:26 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-01-17 15:31:20 +0100
commit07119d1476db0a7568f79cbc855a888007dc7400 (patch)
tree4a49d6aece786619c8571be721ab1ff0b6957834 /tools
parent36ae00127902d931155c5cc066bac37ecbf7faa7 (diff)
downloadmsitools-07119d1476db0a7568f79cbc855a888007dc7400.tar.gz
msitools-07119d1476db0a7568f79cbc855a888007dc7400.tar.xz
msitools-07119d1476db0a7568f79cbc855a888007dc7400.zip
wixl: do not use g_hash_table_add
This is not supported in GLib 2.22, which is the version used in RHEL6.
Diffstat (limited to 'tools')
-rw-r--r--tools/wixl/msi.vala2
-rw-r--r--tools/wixl/preprocessor.vala2
-rw-r--r--tools/wixl/util.vala4
3 files changed, 6 insertions, 2 deletions
diff --git a/tools/wixl/msi.vala b/tools/wixl/msi.vala
index 10bdccd..15092c5 100644
--- a/tools/wixl/msi.vala
+++ b/tools/wixl/msi.vala
@@ -69,7 +69,7 @@ namespace Wixl {
public HashTable<Action, Action*> depends_on = new HashTable<Action, Action*> (direct_hash, direct_equal);
public void add_dep (Action a) {
- depends_on.add (a);
+ hash_table_add (depends_on, a);
a.incoming_deps = true;
}
}
diff --git a/tools/wixl/preprocessor.vala b/tools/wixl/preprocessor.vala
index 73fe114..98c95c9 100644
--- a/tools/wixl/preprocessor.vala
+++ b/tools/wixl/preprocessor.vala
@@ -277,7 +277,7 @@ namespace Wixl {
if (is_req) {
if (requires.lookup_extended (name, null, null))
return;
- requires.add (name);
+ hash_table_add (requires, name);
}
string[] dirs = {};
diff --git a/tools/wixl/util.vala b/tools/wixl/util.vala
index 29d9734..e7fadcc 100644
--- a/tools/wixl/util.vala
+++ b/tools/wixl/util.vala
@@ -32,6 +32,10 @@ namespace Wixl {
return v.value;
}
+ public void hash_table_add<G> (HashTable<G, G*> h, G o) {
+ h.replace (o, o);
+ }
+
public string add_braces (string str) {
if (str[0] == '{')
return str;