X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fserver.cpp;h=879770c5e341f169e656f41d30d2a15ee199b43d;hb=bff6a16b47f8db761c57ce4c17d35916a4da6f1e;hp=500cc58e72682aecf8b733d708529bbf6f1072e9;hpb=62d99f889c0e98be65f779d3983109c84ce58cec;p=xonotic%2Fnetradiant.git

diff --git a/radiant/server.cpp b/radiant/server.cpp
index 500cc58e..879770c5 100644
--- a/radiant/server.cpp
+++ b/radiant/server.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "server.h"
+#include "globaldefs.h"
 
 #include "debugging/debugging.h"
 #include "warnings.h"
@@ -60,7 +61,6 @@ DebugMessageHandler& getDebugMessageHandler(){
 }
 
 void registerModule( const char* type, int version, const char* name, Module& module ){
-	ASSERT_NOTNULL( &module );
 	if ( !m_modules.insert( Modules_::value_type( ModuleKey( ModuleType( type, version ), name ), &module ) ).second ) {
 		globalErrorStream() << "module already registered: type=" << makeQuoted( type ) << " name=" << makeQuoted( name ) << "\n";
 	}
@@ -89,11 +89,11 @@ void foreachModule( const char* type, int version, const Visitor& visitor ){
 };
 
 
-#if defined( WIN32 )
+#if GDEF_OS_WINDOWS
 
 #include <windows.h>
 
-#define FORMAT_BUFSIZE 2048
+const int FORMAT_BUFSIZE = 2048;
 const char* FormatGetLastError(){
 	static char buf[FORMAT_BUFSIZE];
 	FormatMessage(
@@ -131,7 +131,7 @@ bool failed(){
 	return m_library == 0;
 }
 FunctionPointer findSymbol( const char* symbol ){
-	FunctionPointer address = GetProcAddress( m_library, symbol );
+	FunctionPointer address = (FunctionPointer) GetProcAddress( m_library, symbol );
 	if ( address == 0 ) {
 		globalErrorStream() << "GetProcAddress failed: '" << symbol << "'\n";
 		globalErrorStream() << "GetLastError: " << FormatGetLastError();
@@ -140,13 +140,18 @@ FunctionPointer findSymbol( const char* symbol ){
 }
 };
 
-#elif defined( POSIX )
+#elif GDEF_OS_POSIX
 
 #include <dlfcn.h>
 
-class DynamicLibrary
-{
-void* m_library;
+#if GDEF_OS_MACOS
+#ifndef RTLD_DEEPBIND
+#define RTLD_DEEPBIND 0
+#endif // RTLD_DEEPBIND
+#endif // GDEF_OS_MACOS
+
+class DynamicLibrary {
+	void *m_library;
 public:
 typedef int ( *FunctionPointer )();
 
@@ -173,9 +178,9 @@ FunctionPointer findSymbol( const char* symbol ){
 }
 };
 
-#else
+#else // !GDEF_OS_POSIX
 #error "unsupported platform"
-#endif
+#endif // !GDEF_OS_POSIX
 
 class DynamicLibraryModule
 {