X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/af81d5a0b09446188fd6f9c292b51519f2c1cedd..a55e57248b809678d3ac3ac716972def07c2c493:/src/substitution.c

diff --git a/src/substitution.c b/src/substitution.c
index c899ff4..28b9d31 100644
--- a/src/substitution.c
+++ b/src/substitution.c
@@ -34,8 +34,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
-#include "balloc.h"
 #include "s_user.h"
 #include "irc_string.h"
 
@@ -78,7 +76,7 @@ void substitution_free(rb_dlink_list *varlist)
 {
 	rb_dlink_node *nptr, *nptr2;
 
-	DLINK_FOREACH_SAFE(nptr, nptr2, varlist->head)
+	RB_DLINK_FOREACH_SAFE(nptr, nptr2, varlist->head)
 	{
 		struct substitution_variable *tmp = (struct substitution_variable *) nptr->data;
 
@@ -132,7 +130,7 @@ char *substitution_parse(const char *fmt, rb_dlink_list *varlist)
 			/* advance ptr by length of variable */
 			ptr += (pptr - ptr);
 
-			DLINK_FOREACH(nptr, varlist->head)
+			RB_DLINK_FOREACH(nptr, varlist->head)
 			{
 				struct substitution_variable *val = (struct substitution_variable *) nptr->data;