diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-04-14 18:17:35 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-04-14 18:17:35 +0400 |
| commit | eaeafd940d146d28720d2c6cb38be4e5688e23b0 (patch) | |
| tree | dc0f157d920feb65247d540160aa2fa2d395baef /mcs | |
| parent | cdc1dd1be14f21099300aba5fbea2831a23ebf61 (diff) | |
2010-04-14 Gonzalo Paniagua Javier <gonzalo@novell.com>
* DeflateStream.cs: the delegate uses Cdecl calling convention on
windows too. Fixes bug #574713.
svn path=/branches/mono-2-6/mcs/; revision=155396
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/System/System.IO.Compression/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System/System.IO.Compression/DeflateStream.cs | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mcs/class/System/System.IO.Compression/ChangeLog b/mcs/class/System/System.IO.Compression/ChangeLog index 38cea86edd5..bb6f278ba7c 100644 --- a/mcs/class/System/System.IO.Compression/ChangeLog +++ b/mcs/class/System/System.IO.Compression/ChangeLog @@ -1,3 +1,8 @@ +2010-04-14 Gonzalo Paniagua Javier <gonzalo@novell.com> + + * DeflateStream.cs: the delegate uses Cdecl calling convention on + windows too. Fixes bug #574713. + 2010-04-07 Gonzalo Paniagua Javier <gonzalo@novell.com> * DeflateStream.cs: always use Cdecl, since the library is compiled diff --git a/mcs/class/System/System.IO.Compression/DeflateStream.cs b/mcs/class/System/System.IO.Compression/DeflateStream.cs index 63da8eddcc5..5d484120745 100644 --- a/mcs/class/System/System.IO.Compression/DeflateStream.cs +++ b/mcs/class/System/System.IO.Compression/DeflateStream.cs @@ -42,6 +42,7 @@ namespace System.IO.Compression { public class DeflateStream : Stream { const int BufferSize = 4096; + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate int UnmanagedReadOrWrite (IntPtr buffer, int length, IntPtr data); delegate int ReadMethod (byte[] array, int offset, int count); delegate void WriteMethod (byte[] array, int offset, int count); |