From 4365d3763d2e0d56cdf120aad7dbba4c216e0d9f Mon Sep 17 00:00:00 2001
From: Borja Ferrer <faluco@alliedmods.net>
Date: Sat, 23 Feb 2008 20:33:33 +0000
Subject: [PATCH] moved these includes for GCC
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401901
---
core/vm/sp_vm_engine.cpp | 10 ++++++++++
core/vm/sp_vm_engine.h | 11 ++---------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/core/vm/sp_vm_engine.cpp b/core/vm/sp_vm_engine.cpp
index 02615e26..9438c034 100644
--- a/core/vm/sp_vm_engine.cpp
+++ b/core/vm/sp_vm_engine.cpp
@@ -29,6 +29,16 @@
* Version: $Id$
*/
+#include <sh_memory.h>
+/* HACK to avoid including sourcehook.h for just the SH_ASSERT definition */
+#if !defined SH_ASSERT
+ #define SH_ASSERT(x, info)
+ #include <sh_pagealloc.h>
+ #undef SH_ASSERT
+#else
+ #include <sh_pagealloc.h>
+#endif
+
#include <malloc.h>
#include <string.h>
#include <assert.h>
diff --git a/core/vm/sp_vm_engine.h b/core/vm/sp_vm_engine.h
index 5e3eee98..e5b4294c 100644
--- a/core/vm/sp_vm_engine.h
+++ b/core/vm/sp_vm_engine.h
@@ -32,18 +32,11 @@
#ifndef _INCLUDE_SOURCEPAWN_VM_ENGINE_H_
#define _INCLUDE_SOURCEPAWN_VM_ENGINE_H_
-#include <sh_memory.h>
-/* HACK to avoid including sourcehook.h for just the SH_ASSERT definition */
-#if !defined SH_ASSERT
- #define SH_ASSERT(x, info)
- #include <sh_pagealloc.h>
- #undef SH_ASSERT
-#else
- #include <sh_pagealloc.h>
-#endif
#include "sp_vm_api.h"
#include "sp_vm_function.h"
+class SourceHook::CPageAlloc;
+
struct TracedCall
{
uint32_t cip;