From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 10 Apr 2018 09:50:03 +0000 (+0200)
Subject: lib/generic/trie: avoid uint redefinition
X-Git-Tag: v2.3.0~12^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c227f558573937f679f88dcb2d6d7df2cbc161fd;p=thirdparty%2Fknot-resolver.git

lib/generic/trie: avoid uint redefinition

Well, we could e.g require C11 instead of C99, but this one is easy.
---

diff --git a/lib/generic/trie.c b/lib/generic/trie.c
index 77924bcfc..b14b13c6e 100644
--- a/lib/generic/trie.c
+++ b/lib/generic/trie.c
@@ -47,7 +47,10 @@
 #endif
 
 typedef unsigned char byte;
+#ifndef uint
 typedef unsigned int uint;
+#define uint uint
+#endif
 typedef uint bitmap_t; /*! Bit-maps, using the range of 1<<0 to 1<<16 (inclusive). */
 
 typedef struct {
diff --git a/lib/generic/trie.h b/lib/generic/trie.h
index da79a543a..e4e1a2108 100644
--- a/lib/generic/trie.h
+++ b/lib/generic/trie.h
@@ -31,7 +31,7 @@
  *
  * XXX EDITORS: trie.{h,c} are synced from
  * https://gitlab.labs.nic.cz/knot/knot-dns/tree/68352fc969/src/contrib/qp-trie
- * only with #includes adjusted.
+ * only with tiny adjustments, mostly #includes.
  */
 
 /*! \brief Element value. */