From 817e1ced9535ebd6ef6a0ab35ef5b493355c6510 Mon Sep 17 00:00:00 2001
From: mark <mark@a9ff2418-eebe-19e0-0898-3207744d8c45>
Date: Fri, 7 Sep 2007 20:10:14 +0000
Subject: [PATCH] Mono compatibility changes

---
 Scripts/Engines/RemoteAdmin/Network.cs |  2 ++
 Server/Network/Listener.cs             |  2 ++
 Server/Persistence/SaveMetrics.cs      |  2 ++
 Server/ScriptCompiler.cs               | 22 +++++++++++++++++-----
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Scripts/Engines/RemoteAdmin/Network.cs b/Scripts/Engines/RemoteAdmin/Network.cs
index 3c242a7bc..f614def55 100644
--- a/Scripts/Engines/RemoteAdmin/Network.cs
+++ b/Scripts/Engines/RemoteAdmin/Network.cs
@@ -19,7 +19,9 @@ namespace Server.RemoteAdmin
 		{
 			PacketHandlers.Register( 0xF1, 0, false, new OnPacketReceive( OnReceive ) );
 
+#if !MONO
 			Core.MultiConsoleOut.Add( new EventTextWriter( new EventTextWriter.OnConsoleChar( OnConsoleChar ), new EventTextWriter.OnConsoleLine( OnConsoleLine ), new EventTextWriter.OnConsoleStr( OnConsoleString ) ) );
+#endif
 			Timer.DelayCall( TimeSpan.FromMinutes( 2.5 ), TimeSpan.FromMinutes( 2.5 ), new TimerCallback( CleanUp ) );
 		}
 
diff --git a/Server/Network/Listener.cs b/Server/Network/Listener.cs
index ae70d0d14..653070e21 100644
--- a/Server/Network/Listener.cs
+++ b/Server/Network/Listener.cs
@@ -86,7 +86,9 @@ namespace Server.Network
 			try
 			{
 				s.LingerState.Enabled = false;
+#if !MONO
 				s.ExclusiveAddressUse = false;
+#endif
 
 				s.Bind( ipep );
 				s.Listen( 8 );
diff --git a/Server/Persistence/SaveMetrics.cs b/Server/Persistence/SaveMetrics.cs
index 51ea29863..167d270c1 100644
--- a/Server/Persistence/SaveMetrics.cs
+++ b/Server/Persistence/SaveMetrics.cs
@@ -75,7 +75,9 @@ namespace Server {
 					)
 				);
 
+#if !MONO
 				PerformanceCounterCategory.Create( PerformanceCategoryName, PerformanceCategoryDesc, PerformanceCounterCategoryType.SingleInstance, counters );
+#endif
 			}
 
 			numberOfWorldSaves = new PerformanceCounter( PerformanceCategoryName, "Save - Count", false );
diff --git a/Server/ScriptCompiler.cs b/Server/ScriptCompiler.cs
index d44929f90..e0046d8e4 100644
--- a/Server/ScriptCompiler.cs
+++ b/Server/ScriptCompiler.cs
@@ -82,14 +82,14 @@ namespace Server
 			StringBuilder sb = null;
 
 #if MONO
-			AppendDefine( ref sb, "MONO" );
+			AppendDefine( ref sb, "/d:MONO" );
 #endif
 
 			//These two defines are legacy, ie, depreciated.
 			if( Core.Is64Bit )
-				AppendDefine( ref sb, "x64" );
+				AppendDefine( ref sb, "/d:x64" );
 
-			AppendDefine( ref sb, "Framework_2_0" );
+			AppendDefine( ref sb, "/d:Framework_2_0" );
 
 			return (sb == null ? null : sb.ToString());
 		}
@@ -99,7 +99,7 @@ namespace Server
 			if( sb == null )
 				sb = new StringBuilder();
 			else
-				sb.Append( ';' );
+				sb.Append( ' ' );
 
 			sb.Append( define );
 		}
@@ -216,7 +216,7 @@ namespace Server
 				string defines = GetDefines();
 
 				if( defines != null )
-					parms.CompilerOptions = string.Format( "/D:{0}", defines );
+					parms.CompilerOptions = defines;
 
 				if( Core.HaltOnWarning )
 					parms.WarningLevel = 4;
@@ -226,11 +226,23 @@ namespace Server
 
 				Display( results );
 
+#if !MONO
 				if( results.Errors.Count > 0 )
 				{
 					assembly = null;
 					return false;
 				}
+#else
+				if( results.Errors.Count > 0 ) {
+					foreach( CompilerError err in results.Errors ) {
+						if ( !err.IsWarning ) {
+							assembly = null;
+							return false;
+						}
+					}
+				}
+#endif
+
 
 				if( cache && Path.GetFileName( path ) == "Scripts.CS.dll" )
 				{