Fixed Linux linker error

Author: Ayuto

src/core/modules/memory/memory_tools.h

@@ -42,7 +42,7 @@ using namespace boost::python;
 
 // Externals
 extern DCCallVM* g_pCallVM;
-extern unsigned long ExtractPyPtr(object obj);
+
 
 //-----------------------------------------------------------------------------
 // Memory functions
@@ -244,6 +244,27 @@ class CPointer
 };
 
 
+//---------------------------------------------------------------------------------
+// Converts a Python CPointer object or an integer to an unsigned long.
+//---------------------------------------------------------------------------------
+inline unsigned long ExtractPyPtr(object obj)
+{
+	// Try to get an unsigned long at first
+	try
+	{
+		return extract<unsigned long>(obj);
+	}
+	catch(...)
+	{
+		PyErr_Clear();
+	}
+
+	// If that fails, try to extract a CPointer representation
+	CPointer* pPtr = extract<CPointer *>(obj);
+	return pPtr->m_ulAddr;
+}
+
+
 class CFunction: public CPointer
 {
 public:
@@ -305,4 +326,4 @@ CPointer GetAddress(T* ptr)
 	return CPointer((unsigned long) ptr);
 }
 
-#endif // _MEMORY_TOOLS_H
+#endif // _MEMORY_TOOLS_H

src/core/utility/sp_util.h

@@ -32,7 +32,10 @@
 #include "eiface.h"
 #include "public/game/server/iplayerinfo.h"
 #include "basehandle.h"
-#include "modules/memory/memory_tools.h"
+
+#include "utility/wrap_macros.h"
+#include "boost/python.hpp"
+using namespace boost::python;
 
 // Externals
 extern IVEngineServer* engine;
@@ -41,33 +44,13 @@ extern IPlayerInfoManager* playerinfomanager;
 
 
 //---------------------------------------------------------------------------------
-// Returns True if the class name equals the given string.
+// Returns True if the class name of the given object equals the given string.
 //---------------------------------------------------------------------------------
 inline bool CheckClassname(object obj, char* name)
 {
 	return strcmp(extract<char *>(obj.attr("__class__").attr("__name__")), name) == 0;
 }
 
-//---------------------------------------------------------------------------------
-// Converts a Python CPointer object or an integer to an unsigned long.
-//---------------------------------------------------------------------------------
-inline unsigned long ExtractPyPtr(object obj)
-{
-	// Try to get an unsigned long at first
-	try
-	{
-		return extract<unsigned long>(obj);
-	}
-	catch(...)
-	{
-		PyErr_Clear();
-	}
-
-	// If that fails, try to extract a CPointer representation
-	CPointer* pPtr = extract<CPointer *>(obj);
-	return pPtr->m_ulAddr;
-}
-
 
 //---------------------------------------------------------------------------------
 // Helper template methods for __getitem__ and __setitem__