Author: spouliot
Date: 2005-05-09 11:22:48 -0400 (Mon, 09 May 2005)
New Revision: 44282
Modified:
trunk/mono/mono/tests/cas/demand/ChangeLog
trunk/mono/mono/tests/cas/demand/Makefile
trunk/mono/mono/tests/cas/demand/pinvoke1.cs
trunk/mono/mono/tests/cas/demand/pinvoke2.cs
trunk/mono/mono/tests/cas/demand/pinvoke3.cs
Log:
2005-05-09 Sebastien Pouliot <[EMAIL PROTECTED]>
* pinvoke1-3.cs: Fixed RunningOnWindows to run under NET_2_0.
* Makefile: Changed --debug for -debug to avoid compiler warning.
Modified: trunk/mono/mono/tests/cas/demand/ChangeLog
===================================================================
--- trunk/mono/mono/tests/cas/demand/ChangeLog 2005-05-09 15:19:14 UTC (rev
44281)
+++ trunk/mono/mono/tests/cas/demand/ChangeLog 2005-05-09 15:22:48 UTC (rev
44282)
@@ -1,3 +1,8 @@
+2005-05-09 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * pinvoke1-3.cs: Fixed RunningOnWindows to run under NET_2_0.
+ * Makefile: Changed --debug for -debug to avoid compiler warning.
+
2005-03-24 Sebastien Pouliot <[EMAIL PROTECTED]>
* pinvoke1-3.cs: Changed RunningOnMono for RunningOnWindows as it's an
Modified: trunk/mono/mono/tests/cas/demand/Makefile
===================================================================
--- trunk/mono/mono/tests/cas/demand/Makefile 2005-05-09 15:19:14 UTC (rev
44281)
+++ trunk/mono/mono/tests/cas/demand/Makefile 2005-05-09 15:22:48 UTC (rev
44282)
@@ -1,5 +1,5 @@
RUNTIME = mono --debug --security
-CSCOMPILE = mcs --debug
+CSCOMPILE = mcs -debug
PROFILE = net_1_1
all: pinvoke1.exe pinvoke2.exe pinvoke3.exe \
Modified: trunk/mono/mono/tests/cas/demand/pinvoke1.cs
===================================================================
--- trunk/mono/mono/tests/cas/demand/pinvoke1.cs 2005-05-09 15:19:14 UTC
(rev 44281)
+++ trunk/mono/mono/tests/cas/demand/pinvoke1.cs 2005-05-09 15:22:48 UTC
(rev 44282)
@@ -14,7 +14,8 @@
static bool RunningOnWindows ()
{
- bool win = ((int) Environment.OSVersion.Platform != 128);
+ int p = (int) Environment.OSVersion.Platform;
+ bool win = ((p != 4) && (p != 128));
Console.WriteLine ("Running on {0}...", Environment.OSVersion);
return win;
}
Modified: trunk/mono/mono/tests/cas/demand/pinvoke2.cs
===================================================================
--- trunk/mono/mono/tests/cas/demand/pinvoke2.cs 2005-05-09 15:19:14 UTC
(rev 44281)
+++ trunk/mono/mono/tests/cas/demand/pinvoke2.cs 2005-05-09 15:22:48 UTC
(rev 44282)
@@ -16,7 +16,8 @@
static bool RunningOnWindows ()
{
- bool win = ((int) Environment.OSVersion.Platform != 128);
+ int p = (int) Environment.OSVersion.Platform;
+ bool win = ((p != 4) && (p != 128));
Console.WriteLine ("Running on {0}...", Environment.OSVersion);
return win;
}
Modified: trunk/mono/mono/tests/cas/demand/pinvoke3.cs
===================================================================
--- trunk/mono/mono/tests/cas/demand/pinvoke3.cs 2005-05-09 15:19:14 UTC
(rev 44281)
+++ trunk/mono/mono/tests/cas/demand/pinvoke3.cs 2005-05-09 15:22:48 UTC
(rev 44282)
@@ -15,7 +15,8 @@
static bool RunningOnWindows ()
{
- bool win = ((int) Environment.OSVersion.Platform != 128);
+ int p = (int) Environment.OSVersion.Platform;
+ bool win = ((p != 4) && (p != 128));
Console.WriteLine ("Running on {0}...", Environment.OSVersion);
return win;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
