From 584717bf8c754c2cc57bdb2509768a1f168dc7a2 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Thu, 29 Oct 2009 02:37:52 -0400
Subject: [PATCH] Fixed circular dependency between sourcemm.h/util.h (build
 bustage).

---
 core-legacy/CPlugin.cpp     | 1 +
 core-legacy/CSmmAPI.cpp     | 1 +
 core-legacy/concommands.cpp | 1 +
 core-legacy/sourcemm.h      | 1 -
 core-legacy/util.cpp        | 2 +-
 core-legacy/vsp_bridge.cpp  | 1 +
 6 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core-legacy/CPlugin.cpp b/core-legacy/CPlugin.cpp
index 3d74003..60ac845 100644
--- a/core-legacy/CPlugin.cpp
+++ b/core-legacy/CPlugin.cpp
@@ -13,6 +13,7 @@
 #include "sourcemm.h"
 #include "concommands.h"
 #include "vsp_listener.h"
+#include "util.h"
 
 /** 
  * @brief Implements functions from CPlugin.h
diff --git a/core-legacy/CSmmAPI.cpp b/core-legacy/CSmmAPI.cpp
index 516fd2f..4f943f7 100644
--- a/core-legacy/CSmmAPI.cpp
+++ b/core-legacy/CSmmAPI.cpp
@@ -14,6 +14,7 @@
 #include "concommands.h"
 #include "CPlugin.h"
 #include "vsp_listener.h"
+#include "util.h"
 
 /**
  * @brief Implementation of main API interface
diff --git a/core-legacy/concommands.cpp b/core-legacy/concommands.cpp
index 0f13c8f..aabb89c 100644
--- a/core-legacy/concommands.cpp
+++ b/core-legacy/concommands.cpp
@@ -16,6 +16,7 @@
 #include "sh_string.h"
 #include "sh_list.h"
 #include "vsp_listener.h"
+#include "util.h"
 
 /**
  * @brief Console Command Implementations
diff --git a/core-legacy/sourcemm.h b/core-legacy/sourcemm.h
index 4ceff36..2aa8044 100644
--- a/core-legacy/sourcemm.h
+++ b/core-legacy/sourcemm.h
@@ -24,7 +24,6 @@
 #include "ISmmAPI.h"
 #include "CPlugin.h"
 #include "oslink.h"
-#include "util.h"
 #include "version.h"
 #include "loader_bridge.h"
 
diff --git a/core-legacy/util.cpp b/core-legacy/util.cpp
index e075e8c..2d035c3 100644
--- a/core-legacy/util.cpp
+++ b/core-legacy/util.cpp
@@ -11,9 +11,9 @@
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>
+#include "sourcemm.h"
 #include "util.h"
 #include "oslink.h"
-#include "sourcemm.h"
 
 /**
  * @brief Utility functions
diff --git a/core-legacy/vsp_bridge.cpp b/core-legacy/vsp_bridge.cpp
index df7b760..9a805b6 100644
--- a/core-legacy/vsp_bridge.cpp
+++ b/core-legacy/vsp_bridge.cpp
@@ -28,6 +28,7 @@
 #include <assert.h>
 #include "sourcemm.h"
 #include "concommands.h"
+#include "util.h"
 #include <loader_bridge.h>
 
 SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false);