2003-09-24 Bernie Solomon <bernard@ugsolutions.com>

        * mono/tests/pinvoke*.cs, delegate4.cs, marshal10.cs, marshal4.cs
          marshal5.cs: remove .so from DllImport of libtest to aid portability.

svn path=/trunk/mono/; revision=18286

diff --git a/ChangeLog b/ChangeLog
index c3dd0f2b78fa010432b4eda0c4460688a92880a7..9365e78b026d7ac79596181678c78226dbce2244 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-24  Bernie Solomon  <bernard@ugsolutions.com>
+
+        * mono/tests/pinvoke*.cs, delegate4.cs, marshal10.cs, marshal4.cs
+          marshal5.cs: remove .so from DllImport of libtest to aid portability.
+
 2003-09-08  Zoltan Varga  <vargaz@freemail.hu>
 
        * configure.in: Added check for valgrind headers.

diff --git a/mono/tests/delegate4.cs b/mono/tests/delegate4.cs
index ac227cd50da277501c07c62377e5340ee20db5e8..04d5852516498443b522f54bc73ba38247d42907 100644 (file)
--- a/mono/tests/delegate4.cs
+++ b/mono/tests/delegate4.cs
@@ -6,7 +6,7 @@ using System.Runtime.Remoting.Messaging;
 class Test {
        public delegate int SimpleDelegate (int a, int b);
 
-       [DllImport ("libtest.so", EntryPoint="mono_invoke_delegate")]
+       [DllImport ("libtest", EntryPoint="mono_invoke_delegate")]
        static extern int mono_invoke_delegate (SimpleDelegate d);
 
        public static int Add (int a, int b) {

diff --git a/mono/tests/marshal10.cs b/mono/tests/marshal10.cs
index 193e6239172870f33197add2226ed259418f339f..c516896e955bb3a1a7eb8f49147eb47b9747fcf3 100644 (file)
--- a/mono/tests/marshal10.cs
+++ b/mono/tests/marshal10.cs
@@ -58,7 +58,7 @@ public class MyMarshal: ICustomMarshaler
 
 public class Testing
 {
-       [DllImport("libtest.so")]
+       [DllImport("libtest")]
        [return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(MyMarshal))]
        private static extern string functionReturningString();
 

diff --git a/mono/tests/marshal4.cs b/mono/tests/marshal4.cs
index 48d86adc634957ac0b369a58793ad50acdbecef6..b13926c9759283ab9c4f6edad8a7113963a87cef 100755 (executable)
--- a/mono/tests/marshal4.cs
+++ b/mono/tests/marshal4.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 public class Test {
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_marshal_delegate_struct")]
+       [DllImport ("libtest", EntryPoint="mono_test_marshal_delegate_struct")]
        public static extern int mono_test_marshal_delegate_struct (DelegateStruct s);
 
        public delegate int WndProc (int a);

diff --git a/mono/tests/marshal5.cs b/mono/tests/marshal5.cs
index 5a2601498273be4a901cc11a7814f121f42e7002..63512171dae4ebb28697e2f72c3884c84c2e9844 100644 (file)
--- a/mono/tests/marshal5.cs
+++ b/mono/tests/marshal5.cs
@@ -3,10 +3,10 @@ using System.Runtime.InteropServices;
 
 public class Test 
 {
-       [DllImport ("libtest.so", EntryPoint="mono_test_byvalstr_gen")]
+       [DllImport ("libtest", EntryPoint="mono_test_byvalstr_gen")]
        public static extern IntPtr mono_test_byvalstr_gen();
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_byvalstr_check")]
+       [DllImport ("libtest", EntryPoint="mono_test_byvalstr_check")]
        public static extern int mono_test_byvalstr_check(IntPtr data, string correctString);
        
        [StructLayout (LayoutKind.Sequential)]

diff --git a/mono/tests/pinvoke.cs b/mono/tests/pinvoke.cs
index 68d4ea6a6c79880bea1f2ae84e9b4eadd8f9edb7..eaa62983d888a02e43ded7fda8595ede3a997a7a 100755 (executable)
--- a/mono/tests/pinvoke.cs
+++ b/mono/tests/pinvoke.cs
@@ -6,19 +6,19 @@ public class Test {
        [DllImport("cygwin1.dll", EntryPoint="puts", CharSet=CharSet.Ansi)]
        public static extern int puts (string name);
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_many_int_arguments")]
+       [DllImport ("libtest", EntryPoint="mono_test_many_int_arguments")]
        public static extern int mono_test_many_int_arguments (int a, int b, int c, int d, int e,
                                                               int f, int g, int h, int i, int j);
-       [DllImport ("libtest.so", EntryPoint="mono_test_many_short_arguments")]
+       [DllImport ("libtest", EntryPoint="mono_test_many_short_arguments")]
        public static extern int mono_test_many_short_arguments (short a, short b, short c, short d, short e,
                                                                 short f, short g, short h, short i, short j);
-       [DllImport ("libtest.so", EntryPoint="mono_test_many_byte_arguments")]
+       [DllImport ("libtest", EntryPoint="mono_test_many_byte_arguments")]
        public static extern int mono_test_many_byte_arguments (byte a, byte b, byte c, byte d, byte e,
                                                                byte f, byte g, byte h, byte i, byte j);
-       [DllImport ("libtest.so", EntryPoint="mono_test_many_float_arguments")]
+       [DllImport ("libtest", EntryPoint="mono_test_many_float_arguments")]
        public static extern float mono_test_many_float_arguments (float a, float b, float c, float d, float e,
                                                                float f, float g, float h, float i, float j);
-       [DllImport ("libtest.so", EntryPoint="mono_test_many_double_arguments")]
+       [DllImport ("libtest", EntryPoint="mono_test_many_double_arguments")]
        public static extern double mono_test_many_double_arguments (double a, double b, double c, double d, double e,
                                                                double f, double g, double h, double i, double j);
 

diff --git a/mono/tests/pinvoke1.cs b/mono/tests/pinvoke1.cs
index 8e95d35461b0382d2b10002fb74eede0fb289d2c..ab6c590661c3e0d7b01cf7838dbda75f59aba57a 100755 (executable)
--- a/mono/tests/pinvoke1.cs
+++ b/mono/tests/pinvoke1.cs
@@ -18,7 +18,7 @@ public class Test : T {
 
        delegate int MyDelegate (string name);
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_puts_static")]
+       [DllImport ("libtest", EntryPoint="mono_test_puts_static")]
        public static extern int puts_static (string name);
 
        public static int Main () {

diff --git a/mono/tests/pinvoke10.cs b/mono/tests/pinvoke10.cs
index 150779312a71861f5fcd39083b7cc59c87b58cf0..03d31866df2b4cbdb5b70c091f8818c81faa0df0 100755 (executable)
--- a/mono/tests/pinvoke10.cs
+++ b/mono/tests/pinvoke10.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 public class Test {
 
-       [DllImport("libtest.so")]
+       [DllImport("libtest")]
        [return: MarshalAs(UnmanagedType.LPWStr)]
        private static extern string test_lpwstr_marshal(
                [MarshalAs(UnmanagedType.LPWStr)] string s,

diff --git a/mono/tests/pinvoke11.cs b/mono/tests/pinvoke11.cs
index 87fb3c8c936a4ec65c72532cb1dd1187d932cf50..7031f30d4a0579a94c751623ed62422cf66df822 100644 (file)
--- a/mono/tests/pinvoke11.cs
+++ b/mono/tests/pinvoke11.cs
@@ -24,16 +24,16 @@ public struct cs
 
 public class Test
 {
-       [DllImport ("libtest.so")]
+       [DllImport ("libtest")]
        public static extern int mono_union_test_1 (cs a);
 
-       [DllImport ("libtest.so")]
+       [DllImport ("libtest")]
        public static extern int mono_return_int (int a);
 
-       [DllImport ("libtest.so", EntryPoint="mono_return_int_ss")]
+       [DllImport ("libtest", EntryPoint="mono_return_int_ss")]
        public static extern int mono_return_int_ss (ss a);
 
-       [DllImport ("libtest.so", EntryPoint="mono_return_int_su")]
+       [DllImport ("libtest", EntryPoint="mono_return_int_su")]
        public static extern int mono_return_int_su (su a);
 
         static int Main()

diff --git a/mono/tests/pinvoke13.cs b/mono/tests/pinvoke13.cs
index 0a6283852e8602ea4ddc45e48e03ffcea44525e7..6a2a9cf38bfcb9ccaa06a05090577898ee1b5f49 100644 (file)
--- a/mono/tests/pinvoke13.cs
+++ b/mono/tests/pinvoke13.cs
@@ -4,15 +4,15 @@ using System.Runtime.InteropServices;
 public class DumpTest
 {
        /* this should call HexDumpA with ANSI encoded string */
-       [DllImport("libtest.so", CharSet=CharSet.Ansi)]
+       [DllImport("libtest", CharSet=CharSet.Ansi)]
        private static extern int HexDump (string data);
 
        /* this should call HexDump default version with Unicode string */
-       [DllImport("libtest.so", EntryPoint="HexDump", CharSet=CharSet.Unicode)]
+       [DllImport("libtest", EntryPoint="HexDump", CharSet=CharSet.Unicode)]
        private static extern int HexDump2(string data);
 
        /* this should call HexDump1W with unicode encoding */
-       [DllImport("libtest.so", CharSet=CharSet.Unicode)]
+       [DllImport("libtest", CharSet=CharSet.Unicode)]
        private static extern int HexDump1(string data);
 
        public static int Main()

diff --git a/mono/tests/pinvoke2.cs b/mono/tests/pinvoke2.cs
index 75bd3e7205ccb4c4bf8d3c2c231f05427a857110..590c3118f4c6fcc0d1900c48094fe8e963424111 100755 (executable)
--- a/mono/tests/pinvoke2.cs
+++ b/mono/tests/pinvoke2.cs
@@ -34,19 +34,19 @@ public class Test {
        }
 
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_marshal_char")]
+       [DllImport ("libtest", EntryPoint="mono_test_marshal_char")]
        public static extern int mono_test_marshal_char (char a1);
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_marshal_array")]
+       [DllImport ("libtest", EntryPoint="mono_test_marshal_array")]
        public static extern int mono_test_marshal_array (int [] a1);
        
-       [DllImport ("libtest.so", EntryPoint="mono_test_marshal_struct")]
+       [DllImport ("libtest", EntryPoint="mono_test_marshal_struct")]
        public static extern int mono_test_marshal_struct (SimpleStruct ss);
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_marshal_struct2")]
+       [DllImport ("libtest", EntryPoint="mono_test_marshal_struct2")]
        public static extern int mono_test_marshal_struct2 (SimpleStruct2 ss);
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_marshal_delegate")]
+       [DllImport ("libtest", EntryPoint="mono_test_marshal_delegate")]
        public static extern int mono_test_marshal_delegate (SimpleDelegate d);
 
        public delegate int SimpleDelegate (int a);

diff --git a/mono/tests/pinvoke3.cs b/mono/tests/pinvoke3.cs
index 8c3294a31790d23bb71ae5f44e647fe5ddc978ce..633ec921a1072d6bc2b03ef69320841c303d98db 100755 (executable)
--- a/mono/tests/pinvoke3.cs
+++ b/mono/tests/pinvoke3.cs
@@ -25,7 +25,7 @@ public class Test {
                return 1;
        }
        
-       [DllImport ("libtest.so", EntryPoint="mono_test_marshal_delegate2")]
+       [DllImport ("libtest", EntryPoint="mono_test_marshal_delegate2")]
        public static extern int mono_test_marshal_delegate2 (SimpleDelegate2 d);
 
        public delegate int SimpleDelegate2 (SimpleStruct ss);

diff --git a/mono/tests/pinvoke4.cs b/mono/tests/pinvoke4.cs
index b5a6fe0f3e8c2369140e7d33190420b4ab261299..5d9d1b2125ce297c61f50f9b9e18da9df2a0845b 100755 (executable)
--- a/mono/tests/pinvoke4.cs
+++ b/mono/tests/pinvoke4.cs
@@ -11,7 +11,7 @@ public class Test {
                public string d;
        }
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_return_vtype")]
+       [DllImport ("libtest", EntryPoint="mono_test_return_vtype")]
        public static extern SimpleStruct mono_test_return_vtype ();
 
 

diff --git a/mono/tests/pinvoke5.cs b/mono/tests/pinvoke5.cs
index df81be817990cc60e8787d6b2722b487b498bcfa..c5042184b66d9fd76204c7567d228469172e590b 100755 (executable)
--- a/mono/tests/pinvoke5.cs
+++ b/mono/tests/pinvoke5.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 public class Test {
 
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_marshal_stringbuilder")]
+       [DllImport ("libtest", EntryPoint="mono_test_marshal_stringbuilder")]
        public static extern void mono_test_marshal_stringbuilder (StringBuilder sb, int len);
 
        public static int Main () {

diff --git a/mono/tests/pinvoke6.cs b/mono/tests/pinvoke6.cs
index 8c12d4b823ade2a5e39cdec1d7d7b3a2e523ee55..a00cc5f89eb252e9f3d8e358775896d3b8604f52 100755 (executable)
--- a/mono/tests/pinvoke6.cs
+++ b/mono/tests/pinvoke6.cs
@@ -11,7 +11,7 @@ public class Test {
                public string d;
        }
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_ref_vtype")]
+       [DllImport ("libtest", EntryPoint="mono_test_ref_vtype")]
        public static extern int mono_test_ref_vtype (int a, ref SimpleStruct ss, int b, TestDelegate d);
 
        public static int managed_test_ref_vtype (int a, ref SimpleStruct ss, int b)

diff --git a/mono/tests/pinvoke7.cs b/mono/tests/pinvoke7.cs
index 4ad19b77757bf5e97bc547cdaedc0ffde9cb6bdc..b17433686c9da3b7f57e770b23947ee5881750e5 100755 (executable)
--- a/mono/tests/pinvoke7.cs
+++ b/mono/tests/pinvoke7.cs
@@ -7,7 +7,7 @@ public class Test {
        public struct EmptyStruct {
        }
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_empty_struct")]
+       [DllImport ("libtest", EntryPoint="mono_test_empty_struct")]
        public static extern int mono_test_empty_struct (int a, EmptyStruct es, int b);
 
        public static int Main () {

diff --git a/mono/tests/pinvoke8.cs b/mono/tests/pinvoke8.cs
index a5d5435fa1d3338566294b878468e6763a129bcf..cf999d0b5ceadebe13ec59aae251a16c57603a3e 100755 (executable)
--- a/mono/tests/pinvoke8.cs
+++ b/mono/tests/pinvoke8.cs
@@ -11,7 +11,7 @@ public class Test {
                public string d;
        }
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_return_vtype2")]
+       [DllImport ("libtest", EntryPoint="mono_test_return_vtype2")]
        public static extern SimpleStruct mono_test_return_vtype2 (ReturnVTypeDelegate d);
 
        public static SimpleStruct managed_return_vtype (SimpleStruct ss) {

diff --git a/mono/tests/pinvoke9.cs b/mono/tests/pinvoke9.cs
index b723d7fe1cacf0c24e2268c026a416bd93ff9303..83863c25b7b56a02d4cd182630988a26de6afe46 100755 (executable)
--- a/mono/tests/pinvoke9.cs
+++ b/mono/tests/pinvoke9.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 public class Test {
 
-       [DllImport ("libtest.so", EntryPoint="mono_test_return_string")]
+       [DllImport ("libtest", EntryPoint="mono_test_return_string")]
        public static extern String mono_test_return_string (ReturnStringDelegate d);
 
        public static String managed_return_string (String s) {