2010-04-07 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* DeflateStream.cs: always use Cdecl, since the library is compiled
	using that calling convention in windows too.

svn path=/trunk/mcs/; revision=155017

diff --git a/mcs/class/System/System.IO.Compression/ChangeLog b/mcs/class/System/System.IO.Compression/ChangeLog
index 1ff7bf7edd20f91f42c672d8f8ca5d5137e31cdc..38cea86edd5e424678f37a0d7b68272e9b61e0fd 100644 (file)
--- a/mcs/class/System/System.IO.Compression/ChangeLog
+++ b/mcs/class/System/System.IO.Compression/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-07 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * DeflateStream.cs: always use Cdecl, since the library is compiled
+       using that calling convention in windows too.
+
 2010-03-09 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
        * DeflateStream.cs: don't call unmanaged code when the byte count

diff --git a/mcs/class/System/System.IO.Compression/DeflateStream.cs b/mcs/class/System/System.IO.Compression/DeflateStream.cs
index b83ca4c486da965bac17aa4968a33310a1070840..63da8eddcc50fbecc1fcb22c0eca5915d7898280 100644 (file)
--- a/mcs/class/System/System.IO.Compression/DeflateStream.cs
+++ b/mcs/class/System/System.IO.Compression/DeflateStream.cs
@@ -421,19 +421,19 @@ namespace System.IO.Compression {
                const string LIBNAME = "MonoPosixHelper";
 #endif
 
-               [DllImport (LIBNAME)]
+               [DllImport (LIBNAME, CallingConvention=CallingConvention.Cdecl)]
                static extern IntPtr CreateZStream (CompressionMode compress, bool gzip, UnmanagedReadOrWrite feeder, IntPtr data);
 
-               [DllImport (LIBNAME)]
+               [DllImport (LIBNAME, CallingConvention=CallingConvention.Cdecl)]
                static extern int CloseZStream (IntPtr stream);
 
-               [DllImport (LIBNAME)]
+               [DllImport (LIBNAME, CallingConvention=CallingConvention.Cdecl)]
                static extern int Flush (IntPtr stream);
 
-               [DllImport (LIBNAME)]
+               [DllImport (LIBNAME, CallingConvention=CallingConvention.Cdecl)]
                static extern int ReadZStream (IntPtr stream, IntPtr buffer, int length);
 
-               [DllImport (LIBNAME)]
+               [DllImport (LIBNAME, CallingConvention=CallingConvention.Cdecl)]
                static extern int WriteZStream (IntPtr stream, IntPtr buffer, int length);
        }
 }