From 67cdc16dd9a3344c7445b4a16df1294fa578b0fc Mon Sep 17 00:00:00 2001 From: Danny Kukawka Date: Mon, 11 Aug 2008 16:00:55 +0200 Subject: [PATCH 13/48] fixed merge for uint64 Fixed typo to get merge working again with type=uint64. Should fix fd.o bug #16575. --- hald/create_cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hald/create_cache.c b/hald/create_cache.c index cdc8c9a..d52f834 100644 --- a/hald/create_cache.c +++ b/hald/create_cache.c @@ -159,7 +159,7 @@ get_merge_type (const char *str) return MERGE_BOOLEAN; if (strcmp (str, "int") == 0) return MERGE_INT32; - if (strcmp (str, "unint64") == 0) + if (strcmp (str, "uint64") == 0) return MERGE_UINT64; if (strcmp (str, "double") == 0) return MERGE_DOUBLE; -- 1.6.1.2