From 233e4ffec845280209ee898476a93f43916eed68 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonygarnockjones@gmail.com>
Date: Wed, 1 Jul 2015 12:59:28 -0400
Subject: [PATCH] Promote RET_IF_NO_PTR to treetrie.h

---
 critbit.c  | 3 ---
 treetrie.h | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/critbit.c b/critbit.c
index dd32d5f..09cde62 100644
--- a/critbit.c
+++ b/critbit.c
@@ -8,9 +8,6 @@
 #include "treetrie.h"
 #include "critbit.h"
 
-#define RET_IF_NO_PTR(v) \
-  ({ tt_node_ptr_t ___w = (v); if (TT_NO_PTR_P(___w)) return TT_NO_PTR; ___w; })
-
 int tt_dict_size(tt_arena_t *a, tt_node_ptr_t t) {
   if (TT_EMPTY_DICT_P(t)) {
     return 0;
diff --git a/treetrie.h b/treetrie.h
index 48389e1..a161638 100644
--- a/treetrie.h
+++ b/treetrie.h
@@ -37,6 +37,11 @@ typedef uint32_t tt_node_ptr_t; /* An index shifted left 2 with tag or'd in low
 #define TT_OK_P(x)		((x) == TT_OK)
 #define TT_EMPTY_DICT_P(x)	((x) == TT_EMPTY_DICT)
 
+#define RET_VAL_IF_NO_PTR(v,rv)	\
+  ({ tt_node_ptr_t ___w = (v); if (TT_NO_PTR_P(___w)) return (rv); ___w; })
+
+#define RET_IF_NO_PTR(v)	RET_VAL_IF_NO_PTR(v,TT_NO_PTR)
+
 typedef uint32_t tt_atom_t; /* Atom number 0 is the wildcard atom. */
 
 typedef uint32_t tt_hash_t;