MinGW needs NULL definition when building libTrie

diff --git a/lib/libTrie/include/Trie.h b/lib/libTrie/include/Trie.h
index 1551c9badccc8987833396149b74cd240ec7effa..a69d5e7bbf852a440c0e27f557eb0ccc2b67c435 100644 (file)
--- a/lib/libTrie/include/Trie.h
+++ b/lib/libTrie/include/Trie.h
@@ -45,6 +45,11 @@ int TrieAdd (void *, char const *, size_t, void *);
 /* C++ bindings */
 #else
 
+/* MinGW needs NULL definition */
+#ifndef NULL
+#define NULL 0
+#endif
+
 class TrieCharTransform;
 
 class TrieNode;

diff --git a/lib/libTrie/include/TrieNode.h b/lib/libTrie/include/TrieNode.h
index e9aaec8a3cb55a3e0e59bc66c750ce3a673f2f63..07c03f147d6e2b4a0694e8d7ad2ecb9aa60fd7a3 100644 (file)
--- a/lib/libTrie/include/TrieNode.h
+++ b/lib/libTrie/include/TrieNode.h
@@ -39,6 +39,11 @@
 #include <sys/types.h>
 #include <utility>
 
+/* MinGW needs NULL definition */
+#ifndef NULL
+#define NULL 0
+#endif
+
 /* TODO: parameterize this to be more generic -
 * i.e. M-ary internal node sizes etc
 */