diff --git a/gstreamer-sharp/glib-sharp/Argv.cs b/gstreamer-sharp/glib-sharp/Argv.cs index 2711f4d582..27ccb56266 100644 --- a/gstreamer-sharp/glib-sharp/Argv.cs +++ b/gstreamer-sharp/glib-sharp/Argv.cs @@ -30,10 +30,10 @@ namespace Gst.GLib { IntPtr handle; bool add_progname = false; - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_malloc(IntPtr size); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_free (IntPtr mem); ~Argv () diff --git a/gstreamer-sharp/glib-sharp/DelegateWrapper.cs b/gstreamer-sharp/glib-sharp/DelegateWrapper.cs index 25a2dafebf..e1ab3a15cc 100644 --- a/gstreamer-sharp/glib-sharp/DelegateWrapper.cs +++ b/gstreamer-sharp/glib-sharp/DelegateWrapper.cs @@ -69,10 +69,10 @@ namespace Gst.GLib { } } - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] private delegate void DestroyNotify (IntPtr data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] private static extern void g_object_set_data_full (IntPtr obj, IntPtr name, IntPtr data, DestroyNotify destroy); private void AddDestroyNotify (GLib.Object o) { diff --git a/gstreamer-sharp/glib-sharp/DestroyNotify.cs b/gstreamer-sharp/glib-sharp/DestroyNotify.cs index fe503c3034..1ae06057e5 100644 --- a/gstreamer-sharp/glib-sharp/DestroyNotify.cs +++ b/gstreamer-sharp/glib-sharp/DestroyNotify.cs @@ -23,7 +23,7 @@ namespace Gst.GLib { using System; using System.Runtime.InteropServices; - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] public delegate void DestroyNotify (IntPtr data); public class DestroyHelper { diff --git a/gstreamer-sharp/glib-sharp/FileUtils.cs b/gstreamer-sharp/glib-sharp/FileUtils.cs index c08eaf72a2..83c9d66dcc 100644 --- a/gstreamer-sharp/glib-sharp/FileUtils.cs +++ b/gstreamer-sharp/glib-sharp/FileUtils.cs @@ -27,7 +27,7 @@ namespace Gst.GLib { public class FileUtils { - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] extern static bool g_file_get_contents (IntPtr filename, out IntPtr contents, out int length, out IntPtr error); public static string GetFileContents (string filename) diff --git a/gstreamer-sharp/glib-sharp/Format.cs b/gstreamer-sharp/glib-sharp/Format.cs index 6af7ec26d9..73fbbd65ed 100644 --- a/gstreamer-sharp/glib-sharp/Format.cs +++ b/gstreamer-sharp/glib-sharp/Format.cs @@ -26,7 +26,7 @@ using System.Runtime.InteropServices; namespace Gst.GLib { #if GTK_SHARP_2_14 public class Format { - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_format_size_for_display (long size); static public string SizeForDisplay (long size) diff --git a/gstreamer-sharp/glib-sharp/GException.cs b/gstreamer-sharp/glib-sharp/GException.cs index 1ff507019f..9d047af196 100644 --- a/gstreamer-sharp/glib-sharp/GException.cs +++ b/gstreamer-sharp/glib-sharp/GException.cs @@ -46,7 +46,7 @@ namespace Gst.GLib { } } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_clear_error (ref IntPtr errptr); ~GException () { diff --git a/gstreamer-sharp/glib-sharp/GString.cs b/gstreamer-sharp/glib-sharp/GString.cs index 65bf394387..11ffc8067e 100644 --- a/gstreamer-sharp/glib-sharp/GString.cs +++ b/gstreamer-sharp/glib-sharp/GString.cs @@ -27,7 +27,7 @@ namespace Gst.GLib { IntPtr handle; - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_string_free (IntPtr mem, bool free_segments); ~GString () @@ -35,7 +35,7 @@ namespace Gst.GLib { g_string_free (handle, true); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_string_new (IntPtr text); public GString (string text) diff --git a/gstreamer-sharp/glib-sharp/GType.cs b/gstreamer-sharp/glib-sharp/GType.cs old mode 100644 new mode 100755 index 6679ca8d88..2a871934c2 --- a/gstreamer-sharp/glib-sharp/GType.cs +++ b/gstreamer-sharp/glib-sharp/GType.cs @@ -396,31 +396,31 @@ namespace Gst.GLib { return GType.Is (ValFromInstancePtr (raw), this); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_type_class_peek (IntPtr gtype); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_type_class_ref (IntPtr gtype); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_type_from_name (string name); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_type_init (); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_type_name (IntPtr raw); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_type_parent (IntPtr type); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_type_query (IntPtr type, out GTypeQuery query); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_type_register_static (IntPtr parent, IntPtr name, ref GTypeInfo info, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_type_is_a (IntPtr type, IntPtr is_a_type); } } diff --git a/gstreamer-sharp/glib-sharp/Global.cs b/gstreamer-sharp/glib-sharp/Global.cs index 4f3c17d502..8db5123e59 100644 --- a/gstreamer-sharp/glib-sharp/Global.cs +++ b/gstreamer-sharp/glib-sharp/Global.cs @@ -31,8 +31,6 @@ namespace Gst.GLib { //this is a static class private Global () {} - public const System.Runtime.InteropServices.CallingConvention CallingConvention = System.Runtime.InteropServices.CallingConvention.Cdecl; - public static string ProgramName { get { return GLib.Marshaller.PtrToStringGFree(g_get_prgname()); @@ -44,10 +42,10 @@ namespace Gst.GLib { } } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_set_prgname (IntPtr name); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_get_prgname (); public static string ApplicationName { @@ -61,10 +59,10 @@ namespace Gst.GLib { } } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_set_application_name (IntPtr name); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_get_application_name (); } } diff --git a/gstreamer-sharp/glib-sharp/IOChannel.cs b/gstreamer-sharp/glib-sharp/IOChannel.cs index a58ec45ba0..ff0b0919de 100644 --- a/gstreamer-sharp/glib-sharp/IOChannel.cs +++ b/gstreamer-sharp/glib-sharp/IOChannel.cs @@ -25,7 +25,7 @@ namespace Gst.GLibSharp { using System.Runtime.InteropServices; using GLib; - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] internal delegate bool IOFuncNative(IntPtr source, int condition, IntPtr data); internal class IOFuncWrapper { @@ -319,100 +319,100 @@ namespace Gst.GLib { return (IOChannelError) g_io_channel_error_from_errno (en); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_io_channel_unix_new (int fd); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_io_channel_new_file (IntPtr filename, IntPtr mode, out IntPtr error); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_error_quark (); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_error_from_errno (int en); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_flush (IntPtr raw, out IntPtr error); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_io_channel_init (IntPtr raw); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_read_chars (IntPtr raw, byte[] buf, UIntPtr count, out UIntPtr bytes_read, out IntPtr error); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_read_line (IntPtr raw, out IntPtr str_return, IntPtr length, out UIntPtr terminator_pos, out IntPtr error); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_read_to_end (IntPtr raw, out IntPtr str_return, out UIntPtr length, out IntPtr error); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_read_unichar (IntPtr raw, out uint thechar, out IntPtr error); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_seek_position (IntPtr raw, long offset, int type, out IntPtr error); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_shutdown (IntPtr raw, bool flush, out IntPtr err); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_write_chars (IntPtr raw, byte[] buf, IntPtr count, out UIntPtr bytes_written, out IntPtr error); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_write_unichar (IntPtr raw, uint thechar, out IntPtr error); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_get_buffer_condition (IntPtr raw); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_io_channel_get_buffered (IntPtr raw); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_io_channel_set_buffered (IntPtr raw, bool buffered); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern UIntPtr g_io_channel_get_buffer_size (IntPtr raw); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_io_channel_set_buffer_size (IntPtr raw, UIntPtr size); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_io_channel_get_close_on_unref (IntPtr raw); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_io_channel_set_close_on_unref (IntPtr raw, bool do_close); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_io_channel_get_encoding (IntPtr raw); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_set_encoding (IntPtr raw, IntPtr encoding, out IntPtr error); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_get_flags (IntPtr raw); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_set_flags (IntPtr raw, int flags, out IntPtr error); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_io_channel_get_line_term (IntPtr raw, out int length); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_io_channel_set_line_term (IntPtr raw, byte[] term, int length); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_io_channel_unix_get_fd (IntPtr raw); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_io_channel_ref (IntPtr raw); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_io_channel_unref (IntPtr raw); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_io_add_watch_full (IntPtr raw, int priority, int condition, IOFuncNative func, IntPtr user_data, DestroyNotify notify); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_io_create_watch (IntPtr raw, int condition); } diff --git a/gstreamer-sharp/glib-sharp/Idle.cs b/gstreamer-sharp/glib-sharp/Idle.cs old mode 100644 new mode 100755 index 66267a8450..c3e5c3c5ec --- a/gstreamer-sharp/glib-sharp/Idle.cs +++ b/gstreamer-sharp/glib-sharp/Idle.cs @@ -34,7 +34,7 @@ namespace Gst.GLib { public class Idle { - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate bool IdleHandlerInternal (); @@ -65,7 +65,7 @@ namespace Gst.GLib { { } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_idle_add (IdleHandlerInternal d, IntPtr data); public static uint Add (IdleHandler hndlr) @@ -78,7 +78,7 @@ namespace Gst.GLib { return p.ID; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_idle_add_full (int priority, IdleHandlerInternal d, IntPtr data, DestroyNotify notify); public static uint Add (IdleHandler hndlr, Priority priority) @@ -91,7 +91,7 @@ namespace Gst.GLib { return p.ID; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_source_remove_by_funcs_user_data (Delegate d, IntPtr data); public static void Remove (uint id) diff --git a/gstreamer-sharp/glib-sharp/List.cs b/gstreamer-sharp/glib-sharp/List.cs index 332fded4d1..86b9e9c116 100644 --- a/gstreamer-sharp/glib-sharp/List.cs +++ b/gstreamer-sharp/glib-sharp/List.cs @@ -26,7 +26,7 @@ namespace Gst.GLib { public class List : ListBase { - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_list_copy (IntPtr l); public override object Clone () @@ -34,7 +34,7 @@ namespace Gst.GLib { return new List (g_list_copy (Handle)); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_list_length (IntPtr l); internal override int Length (IntPtr list) @@ -42,7 +42,7 @@ namespace Gst.GLib { return g_list_length (list); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_list_free(IntPtr l); internal override void Free (IntPtr list) @@ -51,7 +51,7 @@ namespace Gst.GLib { g_list_free (list); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_list_append (IntPtr l, IntPtr raw); internal override IntPtr Append (IntPtr list, IntPtr raw) @@ -59,7 +59,7 @@ namespace Gst.GLib { return g_list_append (list, raw); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_list_prepend (IntPtr l, IntPtr raw); internal override IntPtr Prepend (IntPtr list, IntPtr raw) @@ -67,7 +67,7 @@ namespace Gst.GLib { return g_list_prepend (list, raw); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_list_nth_data (IntPtr l, uint n); internal override IntPtr NthData (uint n) diff --git a/gstreamer-sharp/glib-sharp/ListBase.cs b/gstreamer-sharp/glib-sharp/ListBase.cs index a89e7e2f93..6ce0d2b041 100644 --- a/gstreamer-sharp/glib-sharp/ListBase.cs +++ b/gstreamer-sharp/glib-sharp/ListBase.cs @@ -180,10 +180,10 @@ namespace Gst.GLib { return ret; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_free (IntPtr item); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_object_unref (IntPtr item); public void Empty () diff --git a/gstreamer-sharp/glib-sharp/Log.cs b/gstreamer-sharp/glib-sharp/Log.cs index 0e1af464b3..62f6da9cde 100644 --- a/gstreamer-sharp/glib-sharp/Log.cs +++ b/gstreamer-sharp/glib-sharp/Log.cs @@ -58,7 +58,7 @@ namespace Gst.GLib { public class Log { - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate void LogFuncNative (IntPtr log_domain, LogLevelFlags flags, IntPtr message, IntPtr user_data); static LogFuncNative native_handler; @@ -75,7 +75,7 @@ namespace Gst.GLib { func (log_domain, flags, message); } - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate void PrintFuncNative (IntPtr message); class PrintHelper { @@ -124,7 +124,7 @@ namespace Gst.GLib { handlers = new System.Collections.Generic.Dictionary (); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_logv (IntPtr log_domain, LogLevelFlags flags, IntPtr message); public void WriteLog (string logDomain, LogLevelFlags flags, string format, params object [] args) @@ -136,7 +136,7 @@ namespace Gst.GLib { Marshaller.Free (nmessage); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_log_set_handler (IntPtr log_domain, LogLevelFlags flags, LogFuncNative log_func, IntPtr user_data); public static uint SetLogHandler (string logDomain, LogLevelFlags flags, LogFunc logFunc) @@ -153,7 +153,7 @@ namespace Gst.GLib { return result; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_log_remove_handler (IntPtr log_domain, uint handler_id); public static void RemoveLogHandler (string logDomain, uint handlerID) @@ -168,7 +168,7 @@ namespace Gst.GLib { Marshaller.Free (ndom); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern PrintFuncNative g_set_print_handler (PrintFuncNative handler); public static PrintFunc SetPrintHandler (PrintFunc handler) @@ -179,7 +179,7 @@ namespace Gst.GLib { return helper.Invoker; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern PrintFuncNative g_set_printerr_handler (PrintFuncNative handler); public static PrintFunc SetPrintErrorHandler (PrintFunc handler) @@ -190,7 +190,7 @@ namespace Gst.GLib { return helper.Invoker; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_log_default_handler (IntPtr log_domain, LogLevelFlags log_level, IntPtr message, IntPtr unused_data); public static void DefaultHandler (string logDomain, LogLevelFlags logLevel, string message) @@ -203,7 +203,7 @@ namespace Gst.GLib { Marshaller.Free (nmess); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] extern static LogLevelFlags g_log_set_always_fatal (LogLevelFlags fatal_mask); public static LogLevelFlags SetAlwaysFatal (LogLevelFlags fatalMask) @@ -211,7 +211,7 @@ namespace Gst.GLib { return g_log_set_always_fatal (fatalMask); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] extern static LogLevelFlags g_log_set_fatal_mask (IntPtr log_domain, LogLevelFlags fatal_mask); public static LogLevelFlags SetAlwaysFatal (string logDomain, LogLevelFlags fatalMask) @@ -245,7 +245,7 @@ namespace Gst.GLib { } } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] extern static LogFuncNative g_log_set_default_handler (LogFuncNative log_func, IntPtr user_data); public static LogFunc SetDefaultHandler (LogFunc log_func) diff --git a/gstreamer-sharp/glib-sharp/MainContext.cs b/gstreamer-sharp/glib-sharp/MainContext.cs index 9d270a3a3a..3e48cdd082 100644 --- a/gstreamer-sharp/glib-sharp/MainContext.cs +++ b/gstreamer-sharp/glib-sharp/MainContext.cs @@ -27,7 +27,7 @@ namespace Gst.GLib { public class MainContext { IntPtr handle; - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_main_context_new (); public MainContext () @@ -35,7 +35,7 @@ namespace Gst.GLib { handle = g_main_context_new (); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_main_context_ref (IntPtr raw); internal MainContext (IntPtr raw) @@ -50,7 +50,7 @@ namespace Gst.GLib { } } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_main_context_unref (IntPtr raw); ~MainContext () @@ -59,7 +59,7 @@ namespace Gst.GLib { handle = IntPtr.Zero; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_main_context_default (); public static MainContext Default { @@ -68,7 +68,7 @@ namespace Gst.GLib { } } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_main_context_thread_default (); public MainContext ThreadDefault { @@ -79,7 +79,7 @@ namespace Gst.GLib { } } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_main_context_push_thread_default (IntPtr raw); public void PushThreadDefault () @@ -87,7 +87,7 @@ namespace Gst.GLib { g_main_context_push_thread_default (handle); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_main_context_pop_thread_default (IntPtr raw); public void PopThreadDefault () @@ -96,7 +96,7 @@ namespace Gst.GLib { } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_main_context_iteration (IntPtr raw, bool may_block); public bool RunIteration (bool may_block) @@ -109,7 +109,7 @@ namespace Gst.GLib { return RunIteration (false); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_main_context_pending (IntPtr raw); public bool HasPendingEvents @@ -119,7 +119,7 @@ namespace Gst.GLib { } } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_main_context_wakeup (IntPtr raw); public void Wakeup () @@ -142,7 +142,7 @@ namespace Gst.GLib { } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_main_depth (); public static int Depth { get { return g_main_depth (); } diff --git a/gstreamer-sharp/glib-sharp/MainLoop.cs b/gstreamer-sharp/glib-sharp/MainLoop.cs index 0d8083d6b0..d4bed8d71f 100644 --- a/gstreamer-sharp/glib-sharp/MainLoop.cs +++ b/gstreamer-sharp/glib-sharp/MainLoop.cs @@ -25,7 +25,7 @@ namespace Gst.GLib { public class MainLoop { private IntPtr handle; - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_main_loop_new (IntPtr context, bool isRunning); public MainLoop () : this (MainContext.Default) { } @@ -37,7 +37,7 @@ namespace Gst.GLib { handle = g_main_loop_new (context.Handle, is_running); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_main_loop_unref (IntPtr loop); ~MainLoop () @@ -46,7 +46,7 @@ namespace Gst.GLib { handle = IntPtr.Zero; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_main_loop_is_running (IntPtr loop); public bool IsRunning { @@ -55,7 +55,7 @@ namespace Gst.GLib { } } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_main_loop_run (IntPtr loop); public void Run () @@ -63,7 +63,7 @@ namespace Gst.GLib { g_main_loop_run (handle); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_main_loop_quit (IntPtr loop); public void Quit () @@ -71,7 +71,7 @@ namespace Gst.GLib { g_main_loop_quit (handle); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_main_loop_get_context (IntPtr loop); public MainContext Context { diff --git a/gstreamer-sharp/glib-sharp/ManagedValue.cs b/gstreamer-sharp/glib-sharp/ManagedValue.cs index ce2eb9eea8..6481953763 100644 --- a/gstreamer-sharp/glib-sharp/ManagedValue.cs +++ b/gstreamer-sharp/glib-sharp/ManagedValue.cs @@ -58,16 +58,16 @@ namespace Gst.GLib { } } - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate IntPtr CopyFunc (IntPtr gch); - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate void FreeFunc (IntPtr gch); static CopyFunc copy; static FreeFunc free; static GType boxed_type = GType.Invalid; - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_boxed_type_register_static (IntPtr typename, CopyFunc copy_func, FreeFunc free_func); public static GType GType { diff --git a/gstreamer-sharp/glib-sharp/Markup.cs b/gstreamer-sharp/glib-sharp/Markup.cs index 01c6c0efec..49711b337e 100644 --- a/gstreamer-sharp/glib-sharp/Markup.cs +++ b/gstreamer-sharp/glib-sharp/Markup.cs @@ -29,7 +29,7 @@ namespace Gst.GLib { public class Markup { private Markup () {} - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_markup_escape_text (IntPtr text, int len); static public string EscapeText (string s) diff --git a/gstreamer-sharp/glib-sharp/Marshaller.cs b/gstreamer-sharp/glib-sharp/Marshaller.cs index dabe129291..8cf38a117e 100644 --- a/gstreamer-sharp/glib-sharp/Marshaller.cs +++ b/gstreamer-sharp/glib-sharp/Marshaller.cs @@ -29,7 +29,7 @@ namespace Gst.GLib { private Marshaller () {} - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_free (IntPtr mem); public static void Free (IntPtr ptr) @@ -46,7 +46,7 @@ namespace Gst.GLib { g_free (ptrs [i]); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_filename_to_utf8 (IntPtr mem, int len, IntPtr read, out IntPtr written, out IntPtr error); public static string FilenamePtrToString (IntPtr ptr) @@ -114,7 +114,7 @@ namespace Gst.GLib { return ret; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_filename_from_utf8 (IntPtr mem, int len, IntPtr read, out IntPtr written, out IntPtr error); public static IntPtr StringToFilenamePtr (string str) @@ -161,7 +161,7 @@ namespace Gst.GLib { return result; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_strfreev (IntPtr mem); public static void StrFreeV (IntPtr null_term_array) @@ -215,7 +215,7 @@ namespace Gst.GLib { // transparently, since we need to alloc buffers of // [native pointer size] * [count] bytes. - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_malloc(UIntPtr size); public static IntPtr Malloc (ulong size) @@ -328,10 +328,10 @@ namespace Gst.GLib { return local_epoch.AddSeconds (time_t.ToInt64 () + utc_offset); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_malloc0 (UIntPtr size); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_unichar_to_utf8 (uint c, IntPtr buf); public static char GUnicharToChar (uint ucs4_char) @@ -356,7 +356,7 @@ namespace Gst.GLib { return PtrToStringGFree (buf); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_utf16_to_ucs4 (ref ushort c, IntPtr len, IntPtr d1, IntPtr d2, IntPtr d3); public static uint CharToGUnichar (char c) diff --git a/gstreamer-sharp/glib-sharp/NotifyHandler.cs b/gstreamer-sharp/glib-sharp/NotifyHandler.cs index 3636b90fb7..ba6219b968 100644 --- a/gstreamer-sharp/glib-sharp/NotifyHandler.cs +++ b/gstreamer-sharp/glib-sharp/NotifyHandler.cs @@ -22,7 +22,7 @@ namespace Gst.GLib { public delegate void NotifyHandler (object o, NotifyArgs args); public class NotifyArgs : GLib.SignalArgs { - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_get_name (IntPtr pspec); public string Property { diff --git a/gstreamer-sharp/glib-sharp/Object.cs b/gstreamer-sharp/glib-sharp/Object.cs index cc72d828bf..8f279c4133 100644 --- a/gstreamer-sharp/glib-sharp/Object.cs +++ b/gstreamer-sharp/glib-sharp/Object.cs @@ -54,7 +54,7 @@ namespace Gst.GLib { } } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_object_unref (IntPtr raw); static bool PerformQueuedUnrefs () @@ -93,7 +93,7 @@ namespace Gst.GLib { GC.SuppressFinalize (this); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_object_ref (IntPtr raw); public static Object GetObject(IntPtr o, bool owned_ref) @@ -244,7 +244,7 @@ namespace Gst.GLib { OverrideClassStruct (gtype, klass); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_object_class_install_property (IntPtr klass, uint prop_id, IntPtr param_spec); static IntPtr RegisterProperty (GType type, string name, string nick, string blurb, uint property_id, GType property_type, bool can_read, bool can_write) @@ -342,7 +342,7 @@ namespace Gst.GLib { } } - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate void GetPropertyDelegate (IntPtr GObject, uint property_id, ref GLib.Value value, IntPtr pspec); static void GetPropertyCallback (IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec) @@ -363,7 +363,7 @@ namespace Gst.GLib { } } - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate void SetPropertyDelegate (IntPtr GObject, uint property_id, ref GLib.Value value, IntPtr pspec); static void SetPropertyCallback(IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec) @@ -384,7 +384,7 @@ namespace Gst.GLib { } } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_type_add_interface_static (IntPtr gtype, IntPtr iface_type, ref GInterfaceInfo info); static void AddInterfaces (GType gtype, Type t) @@ -438,7 +438,7 @@ namespace Gst.GLib { CreateNativeObject (new string [0], new GLib.Value [0]); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_object_new (IntPtr gtype, IntPtr dummy); struct GParameter { @@ -446,7 +446,7 @@ namespace Gst.GLib { public GLib.Value val; } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_object_newv (IntPtr gtype, int n_params, GParameter[] parms); protected virtual void CreateNativeObject (string[] names, GLib.Value[] vals) @@ -576,7 +576,7 @@ namespace Gst.GLib { } } - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate void NotifyDelegate (IntPtr handle, IntPtr pspec, IntPtr gch); void NotifyCallback (IntPtr handle, IntPtr pspec, IntPtr gch) @@ -652,7 +652,7 @@ namespace Gst.GLib { } } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_object_get_property (IntPtr obj, IntPtr name, ref GLib.Value val); protected GLib.Value GetProperty (string name) @@ -664,7 +664,7 @@ namespace Gst.GLib { return val; } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_object_set_property (IntPtr obj, IntPtr name, ref GLib.Value val); protected void SetProperty (string name, GLib.Value val) @@ -674,7 +674,7 @@ namespace Gst.GLib { GLib.Marshaller.Free (native_name); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_object_notify (IntPtr obj, IntPtr property_name); protected void Notify (string property_name) @@ -689,10 +689,10 @@ namespace Gst.GLib { Signal.OverrideDefaultHandler (gtype, name, cb); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] protected static extern void g_signal_chain_from_overridden (IntPtr args, ref GLib.Value retval); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_type_check_instance_is_a (IntPtr obj, IntPtr gtype); internal static bool IsObject (IntPtr obj) diff --git a/gstreamer-sharp/glib-sharp/ObjectManager.cs b/gstreamer-sharp/glib-sharp/ObjectManager.cs index 1523a8fafa..b83e5e4ed2 100644 --- a/gstreamer-sharp/glib-sharp/ObjectManager.cs +++ b/gstreamer-sharp/glib-sharp/ObjectManager.cs @@ -83,7 +83,7 @@ namespace Gst.GLib { return result; } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_type_parent (IntPtr typ); } } diff --git a/gstreamer-sharp/glib-sharp/ParamSpec.cs b/gstreamer-sharp/glib-sharp/ParamSpec.cs index 236630c34f..f17eb02d62 100644 --- a/gstreamer-sharp/glib-sharp/ParamSpec.cs +++ b/gstreamer-sharp/glib-sharp/ParamSpec.cs @@ -147,58 +147,58 @@ namespace Gst.GLib { uint param_id; } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_char (IntPtr name, IntPtr nick, IntPtr blurb, sbyte min, sbyte max, sbyte dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_uchar (IntPtr name, IntPtr nick, IntPtr blurb, byte min, byte max, byte dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_boolean (IntPtr name, IntPtr nick, IntPtr blurb, bool dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_int (IntPtr name, IntPtr nick, IntPtr blurb, int min, int max, int dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_uint (IntPtr name, IntPtr nick, IntPtr blurb, uint min, uint max, uint dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_long (IntPtr name, IntPtr nick, IntPtr blurb, IntPtr min, IntPtr max, IntPtr dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_ulong (IntPtr name, IntPtr nick, IntPtr blurb, UIntPtr min, UIntPtr max, UIntPtr dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_int64 (IntPtr name, IntPtr nick, IntPtr blurb, long min, long max, long dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_uint64 (IntPtr name, IntPtr nick, IntPtr blurb, ulong min, ulong max, ulong dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_float (IntPtr name, IntPtr nick, IntPtr blurb, float min, float max, float dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_double (IntPtr name, IntPtr nick, IntPtr blurb, double min, double max, double dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_string (IntPtr name, IntPtr nick, IntPtr blurb, IntPtr dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_pointer (IntPtr name, IntPtr nick, IntPtr blurb, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_gtype (IntPtr name, IntPtr nick, IntPtr blurb, IntPtr dval, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_boxed (IntPtr name, IntPtr nick, IntPtr blurb, IntPtr return_type, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_param_spec_object (IntPtr name, IntPtr nick, IntPtr blurb, IntPtr return_type, int flags); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_gtype_get_type (); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_type_is_a (IntPtr a, IntPtr b); } diff --git a/gstreamer-sharp/glib-sharp/PtrArray.cs b/gstreamer-sharp/glib-sharp/PtrArray.cs index 28d9044d98..8d08181df2 100644 --- a/gstreamer-sharp/glib-sharp/PtrArray.cs +++ b/gstreamer-sharp/glib-sharp/PtrArray.cs @@ -32,7 +32,7 @@ namespace Gst.GLib { internal bool elements_owned = false; protected System.Type element_type = null; - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_ptr_array_sized_new (uint n_preallocs); public PtrArray (uint n_preallocs, System.Type element_type, bool owned, bool elements_owned) @@ -43,7 +43,7 @@ namespace Gst.GLib { this.elements_owned = elements_owned; } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_ptr_array_new (); public PtrArray (System.Type element_type, bool owned, bool elements_owned) @@ -77,13 +77,13 @@ namespace Gst.GLib { GC.SuppressFinalize (this); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_ptr_array_free (IntPtr raw, bool free_seg); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_object_unref (IntPtr item); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_free (IntPtr item); void Dispose (bool disposing) @@ -120,7 +120,7 @@ namespace Gst.GLib { } } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_ptr_array_add (IntPtr raw, IntPtr val); public void Add (IntPtr val) @@ -128,7 +128,7 @@ namespace Gst.GLib { g_ptr_array_add (Handle, val); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_ptr_array_remove (IntPtr raw, IntPtr data); public void Remove (IntPtr data) @@ -136,7 +136,7 @@ namespace Gst.GLib { g_ptr_array_remove (Handle, data); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_ptr_array_remove_range (IntPtr raw, uint index, uint length); public void RemoveRange (IntPtr data, uint index, uint length) @@ -260,7 +260,7 @@ namespace Gst.GLib { return new ListEnumerator (this); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_ptr_array_copy (IntPtr raw); // ICloneable diff --git a/gstreamer-sharp/glib-sharp/SList.cs b/gstreamer-sharp/glib-sharp/SList.cs index 672b7e6fcb..d0ccaa7807 100644 --- a/gstreamer-sharp/glib-sharp/SList.cs +++ b/gstreamer-sharp/glib-sharp/SList.cs @@ -26,7 +26,7 @@ namespace Gst.GLib { public class SList : ListBase { - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_slist_copy (IntPtr l); public override object Clone () @@ -34,7 +34,7 @@ namespace Gst.GLib { return new SList (g_slist_copy (Handle)); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_slist_length (IntPtr l); internal override int Length (IntPtr list) @@ -42,7 +42,7 @@ namespace Gst.GLib { return g_slist_length (list); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_slist_free(IntPtr l); internal override void Free (IntPtr list) @@ -51,7 +51,7 @@ namespace Gst.GLib { g_slist_free (list); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_slist_append (IntPtr l, IntPtr raw); internal override IntPtr Append (IntPtr list, IntPtr raw) @@ -59,7 +59,7 @@ namespace Gst.GLib { return g_slist_append (list, raw); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_slist_prepend (IntPtr l, IntPtr raw); internal override IntPtr Prepend (IntPtr list, IntPtr raw) @@ -68,7 +68,7 @@ namespace Gst.GLib { } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_slist_nth_data (IntPtr l, uint n); internal override IntPtr NthData (uint n) diff --git a/gstreamer-sharp/glib-sharp/Signal.cs b/gstreamer-sharp/glib-sharp/Signal.cs index 9ea0549d41..20215f3e82 100644 --- a/gstreamer-sharp/glib-sharp/Signal.cs +++ b/gstreamer-sharp/glib-sharp/Signal.cs @@ -63,7 +63,7 @@ namespace Gst.GLib { public IntPtr param_types; } - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] public delegate bool EmissionHookNative (ref InvocationHint hint, uint n_pvals, IntPtr pvals, IntPtr data); public delegate bool EmissionHook (InvocationHint ihint, object[] inst_and_param_values); @@ -388,32 +388,32 @@ namespace Gst.GLib { g_signal_override_class_closure (id, gtype.Val, closure); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_cclosure_new (Delegate cb, IntPtr data, IntPtr notify); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_signal_get_invocation_hint (IntPtr instance); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_signal_emitv (IntPtr instance_and_params, uint signal_id, uint gquark_detail, ref GLib.Value return_value); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_signal_emitv (IntPtr instance_and_params, uint signal_id, uint gquark_detail, IntPtr return_value); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_signal_lookup (IntPtr name, IntPtr itype); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_signal_override_class_closure (uint id, IntPtr gtype, IntPtr closure); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_signal_query (uint signal_id, out Query query); //better not to expose g_quark_from_static_string () due to memory allocation issues - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_quark_from_string (IntPtr str); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern ulong g_signal_add_emission_hook (uint signal_id, uint gquark_detail, EmissionHookNative hook_func, IntPtr hook_data, IntPtr data_destroy); } diff --git a/gstreamer-sharp/glib-sharp/SignalCallback.cs b/gstreamer-sharp/glib-sharp/SignalCallback.cs index 8580cfb7f9..c7f37aed9c 100644 --- a/gstreamer-sharp/glib-sharp/SignalCallback.cs +++ b/gstreamer-sharp/glib-sharp/SignalCallback.cs @@ -60,7 +60,7 @@ namespace Gst.GLib { _handler = Delegate.Remove (_handler, d); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_signal_connect_data(IntPtr obj, IntPtr name, Delegate cb, int key, IntPtr p, int flags); protected void Connect (string name, Delegate cb, int flags) @@ -70,10 +70,10 @@ namespace Gst.GLib { Marshaller.Free (native_name); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_signal_handler_disconnect (IntPtr instance, uint handler); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_signal_handler_is_connected (IntPtr instance, uint handler); protected void Disconnect () diff --git a/gstreamer-sharp/glib-sharp/SignalClosure.cs b/gstreamer-sharp/glib-sharp/SignalClosure.cs index 020b654e5b..151531dab8 100644 --- a/gstreamer-sharp/glib-sharp/SignalClosure.cs +++ b/gstreamer-sharp/glib-sharp/SignalClosure.cs @@ -136,7 +136,7 @@ namespace Gst.GLib { } } - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate void ClosureMarshal (IntPtr closure, IntPtr return_val, uint n_param_vals, IntPtr param_values, IntPtr invocation_hint, IntPtr marshal_data); static void MarshalCallback (IntPtr raw_closure, IntPtr return_val, uint n_param_vals, IntPtr param_values, IntPtr invocation_hint, IntPtr marshal_data) @@ -183,7 +183,7 @@ namespace Gst.GLib { } } - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate void ClosureNotify (IntPtr data, IntPtr closure); static void NotifyCallback (IntPtr data, IntPtr raw_closure) @@ -202,25 +202,25 @@ namespace Gst.GLib { } } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_cclosure_new (Delegate cb, IntPtr user_data, ClosureNotify notify); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_closure_new_simple (int closure_size, IntPtr dummy); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_closure_set_marshal (IntPtr closure, ClosureMarshal marshaler); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_closure_add_finalize_notifier (IntPtr closure, IntPtr dummy, ClosureNotify notify); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_signal_connect_closure (IntPtr obj, IntPtr name, IntPtr closure, bool is_after); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_signal_handler_disconnect (IntPtr instance, uint handler); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_signal_handler_is_connected (IntPtr instance, uint handler); } } diff --git a/gstreamer-sharp/glib-sharp/Source.cs b/gstreamer-sharp/glib-sharp/Source.cs index 996c3c1b60..e48a7b372a 100644 --- a/gstreamer-sharp/glib-sharp/Source.cs +++ b/gstreamer-sharp/glib-sharp/Source.cs @@ -49,7 +49,7 @@ namespace Gst.GLib { internal static Hashtable source_handlers = new Hashtable (); - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_source_remove (uint tag); public static bool Remove (uint tag) diff --git a/gstreamer-sharp/glib-sharp/Spawn.cs b/gstreamer-sharp/glib-sharp/Spawn.cs index d4214304a9..286030959c 100644 --- a/gstreamer-sharp/glib-sharp/Spawn.cs +++ b/gstreamer-sharp/glib-sharp/Spawn.cs @@ -60,7 +60,7 @@ namespace Gst.GLib { public delegate void SpawnChildSetupFunc (); - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] internal delegate void SpawnChildSetupFuncNative (IntPtr gch); internal class SpawnChildSetupWrapper { @@ -102,7 +102,7 @@ namespace Gst.GLib { this.pid = pid; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_spawn_close_pid (int pid); public void Close () @@ -110,7 +110,7 @@ namespace Gst.GLib { g_spawn_close_pid ((int) pid); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_spawn_async (IntPtr dir, IntPtr[] argv, IntPtr[] envp, int flags, SpawnChildSetupFuncNative func, IntPtr data, out int pid, out IntPtr error); public static bool SpawnAsync (string working_directory, string[] argv, string[] envp, SpawnFlags flags, SpawnChildSetupFunc child_setup, out Process child_process) @@ -130,7 +130,7 @@ namespace Gst.GLib { return result; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_spawn_async_with_pipes (IntPtr dir, IntPtr[] argv, IntPtr[] envp, int flags, SpawnChildSetupFuncNative func, IntPtr data, out int pid, IntPtr stdin, IntPtr stdout, IntPtr stderr, out IntPtr error); public static bool SpawnAsyncWithPipes (string working_directory, string[] argv, string[] envp, SpawnFlags flags, SpawnChildSetupFunc child_setup, out Process child_process, ref int stdin, ref int stdout, ref int stderr) @@ -165,7 +165,7 @@ namespace Gst.GLib { return result; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_spawn_sync (IntPtr dir, IntPtr[] argv, IntPtr[] envp, int flags, SpawnChildSetupFuncNative func, IntPtr data, out IntPtr stdout, out IntPtr stderr, out int exit_status, out IntPtr error); public static bool SpawnSync (string working_directory, string[] argv, string[] envp, SpawnFlags flags, SpawnChildSetupFunc child_setup, out string stdout, out string stderr, out int exit_status) @@ -185,7 +185,7 @@ namespace Gst.GLib { return result; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_spawn_command_line_async (IntPtr cmdline, out IntPtr error); public static bool SpawnCommandLineAsync (string command_line) @@ -198,7 +198,7 @@ namespace Gst.GLib { return result; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_spawn_command_line_sync (IntPtr cmdline, out IntPtr stdout, out IntPtr stderr, out int exit_status, out IntPtr error); public static bool SpawnCommandLineSync (string command_line, out string stdout, out string stderr, out int exit_status) diff --git a/gstreamer-sharp/glib-sharp/Thread.cs b/gstreamer-sharp/glib-sharp/Thread.cs index ab5a274601..6c7db461da 100644 --- a/gstreamer-sharp/glib-sharp/Thread.cs +++ b/gstreamer-sharp/glib-sharp/Thread.cs @@ -28,7 +28,7 @@ namespace Gst.GLib { private Thread () {} - [DllImport ("libgthread-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgthread-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_thread_init (IntPtr i); public static void Init () diff --git a/gstreamer-sharp/glib-sharp/Timeout.cs b/gstreamer-sharp/glib-sharp/Timeout.cs old mode 100644 new mode 100755 index 811347bb28..b33a0656e3 --- a/gstreamer-sharp/glib-sharp/Timeout.cs +++ b/gstreamer-sharp/glib-sharp/Timeout.cs @@ -32,7 +32,7 @@ namespace Gst.GLib { public class Timeout { - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate bool TimeoutHandlerInternal (); internal class TimeoutProxy : SourceProxy { @@ -59,7 +59,7 @@ namespace Gst.GLib { } private Timeout () {} - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_timeout_add (uint interval, TimeoutHandlerInternal d, IntPtr data); public static uint Add (uint interval, TimeoutHandler hndlr) @@ -73,7 +73,7 @@ namespace Gst.GLib { return p.ID; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_timeout_add_full (int priority, uint interval, TimeoutHandlerInternal d, IntPtr data, DestroyNotify notify); public static uint Add (uint interval, TimeoutHandler hndlr, Priority priority) @@ -87,7 +87,7 @@ namespace Gst.GLib { return p.ID; } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_timeout_add_seconds (uint interval, TimeoutHandlerInternal d, IntPtr data); public static uint AddSeconds (uint interval, TimeoutHandler hndlr) @@ -106,7 +106,7 @@ namespace Gst.GLib { Source.Remove (id); } - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_source_remove_by_funcs_user_data (Delegate d, IntPtr data); public static bool Remove (TimeoutHandler hndlr) diff --git a/gstreamer-sharp/glib-sharp/ToggleRef.cs b/gstreamer-sharp/glib-sharp/ToggleRef.cs index 20903f456d..6edf2312df 100644 --- a/gstreamer-sharp/glib-sharp/ToggleRef.cs +++ b/gstreamer-sharp/glib-sharp/ToggleRef.cs @@ -120,7 +120,7 @@ namespace Gst.GLib { } } - [UnmanagedFunctionPointer (Global.CallingConvention)] + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] delegate void ToggleNotifyHandler (IntPtr data, IntPtr handle, bool is_last_ref); static void RefToggled (IntPtr data, IntPtr handle, bool is_last_ref) @@ -143,16 +143,16 @@ namespace Gst.GLib { } } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_object_add_toggle_ref (IntPtr raw, ToggleNotifyHandler notify_cb, IntPtr data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_object_remove_toggle_ref (IntPtr raw, ToggleNotifyHandler notify_cb, IntPtr data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_object_ref (IntPtr raw); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_object_unref (IntPtr raw); } diff --git a/gstreamer-sharp/glib-sharp/Value.cs b/gstreamer-sharp/glib-sharp/Value.cs old mode 100644 new mode 100755 index 0c7483573e..f3d7354745 --- a/gstreamer-sharp/glib-sharp/Value.cs +++ b/gstreamer-sharp/glib-sharp/Value.cs @@ -563,113 +563,113 @@ namespace Gst.GLib { g_value_init (ref this, spec.ValueType.Val); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_object_class_find_property (IntPtr klass, IntPtr name); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_type_check_value_holds (ref Value val, IntPtr gtype); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_init (ref GLib.Value val, IntPtr gtype); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_unset (ref GLib.Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_boolean (ref Value val, bool data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_uchar (ref Value val, byte data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_char (ref Value val, sbyte data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_boxed (ref Value val, IntPtr data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_double (ref Value val, double data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_float (ref Value val, float data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_int (ref Value val, int data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_int64 (ref Value val, long data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_uint64 (ref Value val, ulong data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_object (ref Value val, IntPtr data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_param (ref Value val, IntPtr data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_pointer (ref Value val, IntPtr data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_string (ref Value val, IntPtr data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_uint (ref Value val, uint data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_enum (ref Value val, int data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_set_flags (ref Value val, uint data); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_value_get_boolean (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern byte g_value_get_uchar (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern sbyte g_value_get_char (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_value_get_boxed (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern double g_value_get_double (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern float g_value_get_float (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_value_get_int (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern long g_value_get_int64 (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern ulong g_value_get_uint64 (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_value_get_object (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_value_get_param (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_value_get_pointer (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_value_get_string (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_value_get_uint (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int g_value_get_enum (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint g_value_get_flags (ref Value val); - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_strv_get_type (); } } diff --git a/gstreamer-sharp/glib-sharp/ValueArray.cs b/gstreamer-sharp/glib-sharp/ValueArray.cs index bd1d9dd906..f7f199a4ec 100644 --- a/gstreamer-sharp/glib-sharp/ValueArray.cs +++ b/gstreamer-sharp/glib-sharp/ValueArray.cs @@ -32,7 +32,7 @@ namespace Gst.GLib { static private ArrayList PendingFrees = new ArrayList (); static private bool idle_queued = false; - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_value_array_new (uint n_preallocs); public ValueArray (uint n_preallocs) @@ -57,7 +57,7 @@ namespace Gst.GLib { GC.SuppressFinalize (this); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_array_free (IntPtr raw); void Dispose (bool disposing) @@ -115,7 +115,7 @@ namespace Gst.GLib { get { return Native.values; } } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_array_append (IntPtr raw, ref GLib.Value val); public void Append (GLib.Value val) @@ -123,7 +123,7 @@ namespace Gst.GLib { g_value_array_append (Handle, ref val); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_array_insert (IntPtr raw, uint idx, ref GLib.Value val); public void Insert (uint idx, GLib.Value val) @@ -131,7 +131,7 @@ namespace Gst.GLib { g_value_array_insert (Handle, idx, ref val); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_array_prepend (IntPtr raw, ref GLib.Value val); public void Prepend (GLib.Value val) @@ -139,7 +139,7 @@ namespace Gst.GLib { g_value_array_prepend (Handle, ref val); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_value_array_remove (IntPtr raw, uint idx); public void Remove (uint idx) @@ -152,7 +152,7 @@ namespace Gst.GLib { get { return (int) Native.n_values; } } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_value_array_get_nth (IntPtr raw, uint idx); public object this [int index] { @@ -226,7 +226,7 @@ namespace Gst.GLib { return new ListEnumerator (this); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_value_array_copy (IntPtr raw); // ICloneable @@ -235,7 +235,7 @@ namespace Gst.GLib { return new ValueArray (g_value_array_copy (Handle)); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_value_array_get_type (); public static GLib.GType GType { diff --git a/gstreamer-sharp/glib-sharp/gst-glib-sharp.diff b/gstreamer-sharp/glib-sharp/gst-glib-sharp.diff index 5770c3908c..a386cfc69b 100644 --- a/gstreamer-sharp/glib-sharp/gst-glib-sharp.diff +++ b/gstreamer-sharp/glib-sharp/gst-glib-sharp.diff @@ -1,6 +1,6 @@ -diff -Naur glib/Argv.cs glib-sharp/Argv.cs ---- glib/Argv.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Argv.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Argv.cs glib-sharp/Argv.cs +--- glib-sharp-upstream/Argv.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Argv.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -10,9 +10,9 @@ diff -Naur glib/Argv.cs glib-sharp/Argv.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/Boxed.cs glib-sharp/Boxed.cs ---- glib/Boxed.cs 2004-10-21 03:08:10.000000000 +0200 -+++ glib-sharp/Boxed.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Boxed.cs glib-sharp/Boxed.cs +--- glib-sharp-upstream/Boxed.cs 2004-10-21 03:08:10.000000000 +0200 ++++ glib-sharp/Boxed.cs 2009-09-11 08:35:22.000000000 +0200 @@ -18,7 +18,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. @@ -22,9 +22,9 @@ diff -Naur glib/Boxed.cs glib-sharp/Boxed.cs using System; -diff -Naur glib/CDeclCallbackAttribute.cs glib-sharp/CDeclCallbackAttribute.cs ---- glib/CDeclCallbackAttribute.cs 2009-07-02 22:18:10.000000000 +0200 -+++ glib-sharp/CDeclCallbackAttribute.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/CDeclCallbackAttribute.cs glib-sharp/CDeclCallbackAttribute.cs +--- glib-sharp-upstream/CDeclCallbackAttribute.cs 2009-07-02 22:18:10.000000000 +0200 ++++ glib-sharp/CDeclCallbackAttribute.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -34,9 +34,9 @@ diff -Naur glib/CDeclCallbackAttribute.cs glib-sharp/CDeclCallbackAttribute.cs using System; -diff -Naur glib/ClassInitializerAttribute.cs glib-sharp/ClassInitializerAttribute.cs ---- glib/ClassInitializerAttribute.cs 2007-09-07 16:40:46.000000000 +0200 -+++ glib-sharp/ClassInitializerAttribute.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/ClassInitializerAttribute.cs glib-sharp/ClassInitializerAttribute.cs +--- glib-sharp-upstream/ClassInitializerAttribute.cs 2007-09-07 16:40:46.000000000 +0200 ++++ glib-sharp/ClassInitializerAttribute.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -46,9 +46,9 @@ diff -Naur glib/ClassInitializerAttribute.cs glib-sharp/ClassInitializerAttribut using System; -diff -Naur glib/ConnectBeforeAttribute.cs glib-sharp/ConnectBeforeAttribute.cs ---- glib/ConnectBeforeAttribute.cs 2004-06-25 20:42:19.000000000 +0200 -+++ glib-sharp/ConnectBeforeAttribute.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/ConnectBeforeAttribute.cs glib-sharp/ConnectBeforeAttribute.cs +--- glib-sharp-upstream/ConnectBeforeAttribute.cs 2004-06-25 20:42:19.000000000 +0200 ++++ glib-sharp/ConnectBeforeAttribute.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -58,9 +58,9 @@ diff -Naur glib/ConnectBeforeAttribute.cs glib-sharp/ConnectBeforeAttribute.cs using System; -diff -Naur glib/DefaultSignalHandlerAttribute.cs glib-sharp/DefaultSignalHandlerAttribute.cs ---- glib/DefaultSignalHandlerAttribute.cs 2004-06-25 20:42:19.000000000 +0200 -+++ glib-sharp/DefaultSignalHandlerAttribute.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/DefaultSignalHandlerAttribute.cs glib-sharp/DefaultSignalHandlerAttribute.cs +--- glib-sharp-upstream/DefaultSignalHandlerAttribute.cs 2004-06-25 20:42:19.000000000 +0200 ++++ glib-sharp/DefaultSignalHandlerAttribute.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -70,9 +70,9 @@ diff -Naur glib/DefaultSignalHandlerAttribute.cs glib-sharp/DefaultSignalHandler using System; -diff -Naur glib/DelegateWrapper.cs glib-sharp/DelegateWrapper.cs ---- glib/DelegateWrapper.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/DelegateWrapper.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/DelegateWrapper.cs glib-sharp/DelegateWrapper.cs +--- glib-sharp-upstream/DelegateWrapper.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/DelegateWrapper.cs 2009-09-11 08:35:22.000000000 +0200 @@ -22,7 +22,7 @@ // Boston, MA 02111-1307, USA. @@ -82,9 +82,9 @@ diff -Naur glib/DelegateWrapper.cs glib-sharp/DelegateWrapper.cs using System; using System.Collections; -diff -Naur glib/DestroyNotify.cs glib-sharp/DestroyNotify.cs ---- glib/DestroyNotify.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/DestroyNotify.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/DestroyNotify.cs glib-sharp/DestroyNotify.cs +--- glib-sharp-upstream/DestroyNotify.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/DestroyNotify.cs 2009-09-11 08:35:22.000000000 +0200 @@ -18,7 +18,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. @@ -94,9 +94,9 @@ diff -Naur glib/DestroyNotify.cs glib-sharp/DestroyNotify.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/EnumWrapper.cs glib-sharp/EnumWrapper.cs ---- glib/EnumWrapper.cs 2005-07-22 20:36:50.000000000 +0200 -+++ glib-sharp/EnumWrapper.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/EnumWrapper.cs glib-sharp/EnumWrapper.cs +--- glib-sharp-upstream/EnumWrapper.cs 2005-07-22 20:36:50.000000000 +0200 ++++ glib-sharp/EnumWrapper.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -106,9 +106,9 @@ diff -Naur glib/EnumWrapper.cs glib-sharp/EnumWrapper.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/ExceptionManager.cs glib-sharp/ExceptionManager.cs ---- glib/ExceptionManager.cs 2007-03-08 21:28:24.000000000 +0100 -+++ glib-sharp/ExceptionManager.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/ExceptionManager.cs glib-sharp/ExceptionManager.cs +--- glib-sharp-upstream/ExceptionManager.cs 2007-03-08 21:28:24.000000000 +0100 ++++ glib-sharp/ExceptionManager.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -118,9 +118,9 @@ diff -Naur glib/ExceptionManager.cs glib-sharp/ExceptionManager.cs using System; -diff -Naur glib/FileUtils.cs glib-sharp/FileUtils.cs ---- glib/FileUtils.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/FileUtils.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/FileUtils.cs glib-sharp/FileUtils.cs +--- glib-sharp-upstream/FileUtils.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/FileUtils.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -130,9 +130,9 @@ diff -Naur glib/FileUtils.cs glib-sharp/FileUtils.cs using System; using System.Text; -diff -Naur glib/Format.cs glib-sharp/Format.cs ---- glib/Format.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Format.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Format.cs glib-sharp/Format.cs +--- glib-sharp-upstream/Format.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Format.cs 2009-09-11 08:35:22.000000000 +0200 @@ -23,7 +23,7 @@ using System; using System.Runtime.InteropServices; @@ -141,10 +141,10 @@ diff -Naur glib/Format.cs glib-sharp/Format.cs +namespace Gst.GLib { #if GTK_SHARP_2_14 public class Format { - [DllImport ("libglib-2.0-0.dll", CallingConvention = Global.CallingConvention)] -diff -Naur glib/GException.cs glib-sharp/GException.cs ---- glib/GException.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/GException.cs 2009-09-03 10:41:01.000000000 +0200 + [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +diff -Naur glib-sharp-upstream/GException.cs glib-sharp/GException.cs +--- glib-sharp-upstream/GException.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/GException.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -154,9 +154,9 @@ diff -Naur glib/GException.cs glib-sharp/GException.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/GInterfaceAdapter.cs glib-sharp/GInterfaceAdapter.cs ---- glib/GInterfaceAdapter.cs 2009-07-21 08:51:10.000000000 +0200 -+++ glib-sharp/GInterfaceAdapter.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/GInterfaceAdapter.cs glib-sharp/GInterfaceAdapter.cs +--- glib-sharp-upstream/GInterfaceAdapter.cs 2009-07-21 08:51:10.000000000 +0200 ++++ glib-sharp/GInterfaceAdapter.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -166,9 +166,9 @@ diff -Naur glib/GInterfaceAdapter.cs glib-sharp/GInterfaceAdapter.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/GInterfaceAttribute.cs glib-sharp/GInterfaceAttribute.cs ---- glib/GInterfaceAttribute.cs 2007-09-11 22:34:24.000000000 +0200 -+++ glib-sharp/GInterfaceAttribute.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/GInterfaceAttribute.cs glib-sharp/GInterfaceAttribute.cs +--- glib-sharp-upstream/GInterfaceAttribute.cs 2007-09-11 22:34:24.000000000 +0200 ++++ glib-sharp/GInterfaceAttribute.cs 2009-09-11 08:35:22.000000000 +0200 @@ -17,7 +17,7 @@ // Boston, MA 02111-1307, USA. @@ -178,9 +178,12 @@ diff -Naur glib/GInterfaceAttribute.cs glib-sharp/GInterfaceAttribute.cs using System; -diff -Naur glib/Global.cs glib-sharp/Global.cs ---- glib/Global.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Global.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/glib-api.xml glib-sharp/glib-api.xml +diff -Naur glib-sharp-upstream/glib-sharp-3.0.pc.in glib-sharp/glib-sharp-3.0.pc.in +diff -Naur glib-sharp-upstream/glib-sharp.dll.config.in glib-sharp/glib-sharp.dll.config.in +diff -Naur glib-sharp-upstream/Global.cs glib-sharp/Global.cs +--- glib-sharp-upstream/Global.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Global.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -190,12 +193,13 @@ diff -Naur glib/Global.cs glib-sharp/Global.cs using System; using System.Text; -diff -Naur glib/glue/Makefile.am glib-sharp/glue/Makefile.am -diff -Naur glib/glue/thread.c glib-sharp/glue/thread.c -diff -Naur glib/glue/win32dll.c glib-sharp/glue/win32dll.c -diff -Naur glib/GString.cs glib-sharp/GString.cs ---- glib/GString.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/GString.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/glue/Makefile.am glib-sharp/glue/Makefile.am +diff -Naur glib-sharp-upstream/glue/thread.c glib-sharp/glue/thread.c +diff -Naur glib-sharp-upstream/glue/win32dll.c glib-sharp/glue/win32dll.c +diff -Naur glib-sharp-upstream/gst-glib-sharp.diff glib-sharp/gst-glib-sharp.diff +diff -Naur glib-sharp-upstream/GString.cs glib-sharp/GString.cs +--- glib-sharp-upstream/GString.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/GString.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -205,9 +209,9 @@ diff -Naur glib/GString.cs glib-sharp/GString.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/GTypeAttribute.cs glib-sharp/GTypeAttribute.cs ---- glib/GTypeAttribute.cs 2005-05-04 18:54:24.000000000 +0200 -+++ glib-sharp/GTypeAttribute.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/GTypeAttribute.cs glib-sharp/GTypeAttribute.cs +--- glib-sharp-upstream/GTypeAttribute.cs 2005-05-04 18:54:24.000000000 +0200 ++++ glib-sharp/GTypeAttribute.cs 2009-09-11 08:35:22.000000000 +0200 @@ -17,7 +17,7 @@ // Boston, MA 02111-1307, USA. @@ -217,9 +221,9 @@ diff -Naur glib/GTypeAttribute.cs glib-sharp/GTypeAttribute.cs using System; -diff -Naur glib/GType.cs glib-sharp/GType.cs ---- glib/GType.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/GType.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/GType.cs glib-sharp/GType.cs +--- glib-sharp-upstream/GType.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/GType.cs 2009-09-11 08:35:22.000000000 +0200 @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -229,9 +233,9 @@ diff -Naur glib/GType.cs glib-sharp/GType.cs using System; using System.Collections; -diff -Naur glib/Idle.cs glib-sharp/Idle.cs ---- glib/Idle.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Idle.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Idle.cs glib-sharp/Idle.cs +--- glib-sharp-upstream/Idle.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Idle.cs 2009-09-11 08:35:22.000000000 +0200 @@ -24,7 +24,7 @@ // Boston, MA 02111-1307, USA. @@ -241,9 +245,9 @@ diff -Naur glib/Idle.cs glib-sharp/Idle.cs using System; using System.Collections; -diff -Naur glib/IgnoreClassInitializersAttribute.cs glib-sharp/IgnoreClassInitializersAttribute.cs ---- glib/IgnoreClassInitializersAttribute.cs 2007-09-07 16:40:46.000000000 +0200 -+++ glib-sharp/IgnoreClassInitializersAttribute.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/IgnoreClassInitializersAttribute.cs glib-sharp/IgnoreClassInitializersAttribute.cs +--- glib-sharp-upstream/IgnoreClassInitializersAttribute.cs 2007-09-07 16:40:46.000000000 +0200 ++++ glib-sharp/IgnoreClassInitializersAttribute.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -253,9 +257,9 @@ diff -Naur glib/IgnoreClassInitializersAttribute.cs glib-sharp/IgnoreClassInitia using System; -diff -Naur glib/InitiallyUnowned.cs glib-sharp/InitiallyUnowned.cs ---- glib/InitiallyUnowned.cs 2009-08-08 05:06:53.000000000 +0200 -+++ glib-sharp/InitiallyUnowned.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/InitiallyUnowned.cs glib-sharp/InitiallyUnowned.cs +--- glib-sharp-upstream/InitiallyUnowned.cs 2009-08-08 05:06:53.000000000 +0200 ++++ glib-sharp/InitiallyUnowned.cs 2009-09-11 08:35:22.000000000 +0200 @@ -20,7 +20,7 @@ #if GTK_SHARP_2_10 @@ -265,9 +269,9 @@ diff -Naur glib/InitiallyUnowned.cs glib-sharp/InitiallyUnowned.cs using System; using System.Collections; -diff -Naur glib/IOChannel.cs glib-sharp/IOChannel.cs ---- glib/IOChannel.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/IOChannel.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/IOChannel.cs glib-sharp/IOChannel.cs +--- glib-sharp-upstream/IOChannel.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/IOChannel.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -286,9 +290,9 @@ diff -Naur glib/IOChannel.cs glib-sharp/IOChannel.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/IWrapper.cs glib-sharp/IWrapper.cs ---- glib/IWrapper.cs 2004-06-25 20:42:19.000000000 +0200 -+++ glib-sharp/IWrapper.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/IWrapper.cs glib-sharp/IWrapper.cs +--- glib-sharp-upstream/IWrapper.cs 2004-06-25 20:42:19.000000000 +0200 ++++ glib-sharp/IWrapper.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -298,9 +302,9 @@ diff -Naur glib/IWrapper.cs glib-sharp/IWrapper.cs { using System; -diff -Naur glib/ListBase.cs glib-sharp/ListBase.cs ---- glib/ListBase.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/ListBase.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/ListBase.cs glib-sharp/ListBase.cs +--- glib-sharp-upstream/ListBase.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/ListBase.cs 2009-09-11 08:35:22.000000000 +0200 @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -310,9 +314,9 @@ diff -Naur glib/ListBase.cs glib-sharp/ListBase.cs using System; using System.Collections; -diff -Naur glib/List.cs glib-sharp/List.cs ---- glib/List.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/List.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/List.cs glib-sharp/List.cs +--- glib-sharp-upstream/List.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/List.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -322,9 +326,9 @@ diff -Naur glib/List.cs glib-sharp/List.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/Log.cs glib-sharp/Log.cs ---- glib/Log.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Log.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Log.cs glib-sharp/Log.cs +--- glib-sharp-upstream/Log.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Log.cs 2009-09-11 08:35:22.000000000 +0200 @@ -22,7 +22,7 @@ // @@ -334,9 +338,9 @@ diff -Naur glib/Log.cs glib-sharp/Log.cs using System; using System.Collections; -diff -Naur glib/MainContext.cs glib-sharp/MainContext.cs ---- glib/MainContext.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/MainContext.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/MainContext.cs glib-sharp/MainContext.cs +--- glib-sharp-upstream/MainContext.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/MainContext.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -346,9 +350,9 @@ diff -Naur glib/MainContext.cs glib-sharp/MainContext.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/MainLoop.cs glib-sharp/MainLoop.cs ---- glib/MainLoop.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/MainLoop.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/MainLoop.cs glib-sharp/MainLoop.cs +--- glib-sharp-upstream/MainLoop.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/MainLoop.cs 2009-09-11 08:35:22.000000000 +0200 @@ -21,7 +21,7 @@ using System; using System.Runtime.InteropServices; @@ -358,10 +362,10 @@ diff -Naur glib/MainLoop.cs glib-sharp/MainLoop.cs public class MainLoop { private IntPtr handle; -diff -Naur glib/Makefile.am glib-sharp/Makefile.am -diff -Naur glib/ManagedValue.cs glib-sharp/ManagedValue.cs ---- glib/ManagedValue.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/ManagedValue.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Makefile.am glib-sharp/Makefile.am +diff -Naur glib-sharp-upstream/ManagedValue.cs glib-sharp/ManagedValue.cs +--- glib-sharp-upstream/ManagedValue.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/ManagedValue.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -380,9 +384,9 @@ diff -Naur glib/ManagedValue.cs glib-sharp/ManagedValue.cs boxed_type = new GLib.GType (g_boxed_type_register_static (name, copy, free)); Marshaller.Free (name); } -diff -Naur glib/Markup.cs glib-sharp/Markup.cs ---- glib/Markup.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Markup.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Markup.cs glib-sharp/Markup.cs +--- glib-sharp-upstream/Markup.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Markup.cs 2009-09-11 08:35:22.000000000 +0200 @@ -23,7 +23,7 @@ using System; using System.Runtime.InteropServices; @@ -392,9 +396,9 @@ diff -Naur glib/Markup.cs glib-sharp/Markup.cs public class Markup { -diff -Naur glib/Marshaller.cs glib-sharp/Marshaller.cs ---- glib/Marshaller.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Marshaller.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Marshaller.cs glib-sharp/Marshaller.cs +--- glib-sharp-upstream/Marshaller.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Marshaller.cs 2009-09-11 08:35:22.000000000 +0200 @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. @@ -404,9 +408,9 @@ diff -Naur glib/Marshaller.cs glib-sharp/Marshaller.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/MissingIntPtrCtorException.cs glib-sharp/MissingIntPtrCtorException.cs ---- glib/MissingIntPtrCtorException.cs 2004-06-25 20:42:19.000000000 +0200 -+++ glib-sharp/MissingIntPtrCtorException.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/MissingIntPtrCtorException.cs glib-sharp/MissingIntPtrCtorException.cs +--- glib-sharp-upstream/MissingIntPtrCtorException.cs 2004-06-25 20:42:19.000000000 +0200 ++++ glib-sharp/MissingIntPtrCtorException.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -416,9 +420,9 @@ diff -Naur glib/MissingIntPtrCtorException.cs glib-sharp/MissingIntPtrCtorExcept using System; using System.Runtime.InteropServices; -diff -Naur glib/NotifyHandler.cs glib-sharp/NotifyHandler.cs ---- glib/NotifyHandler.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/NotifyHandler.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/NotifyHandler.cs glib-sharp/NotifyHandler.cs +--- glib-sharp-upstream/NotifyHandler.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/NotifyHandler.cs 2009-09-11 08:35:22.000000000 +0200 @@ -14,7 +14,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. @@ -428,9 +432,9 @@ diff -Naur glib/NotifyHandler.cs glib-sharp/NotifyHandler.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/Object.cs glib-sharp/Object.cs ---- glib/Object.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Object.cs 2009-09-03 10:45:33.000000000 +0200 +diff -Naur glib-sharp-upstream/Object.cs glib-sharp/Object.cs +--- glib-sharp-upstream/Object.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Object.cs 2009-09-11 08:35:22.000000000 +0200 @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -506,7 +510,7 @@ diff -Naur glib/Object.cs glib-sharp/Object.cs + OverrideClassStruct (gtype, klass); } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = Global.CallingConvention)] + [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] @@ -230,9 +256,68 @@ return pspec.Handle; } @@ -640,9 +644,9 @@ diff -Naur glib/Object.cs glib-sharp/Object.cs struct GObject { public GTypeInstance type_instance; public uint ref_count; -diff -Naur glib/ObjectManager.cs glib-sharp/ObjectManager.cs ---- glib/ObjectManager.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/ObjectManager.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/ObjectManager.cs glib-sharp/ObjectManager.cs +--- glib-sharp-upstream/ObjectManager.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/ObjectManager.cs 2009-09-11 08:35:22.000000000 +0200 @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -652,9 +656,9 @@ diff -Naur glib/ObjectManager.cs glib-sharp/ObjectManager.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/Opaque.cs glib-sharp/Opaque.cs ---- glib/Opaque.cs 2009-01-29 17:26:09.000000000 +0100 -+++ glib-sharp/Opaque.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Opaque.cs glib-sharp/Opaque.cs +--- glib-sharp-upstream/Opaque.cs 2009-01-29 17:26:09.000000000 +0100 ++++ glib-sharp/Opaque.cs 2009-09-11 08:35:22.000000000 +0200 @@ -24,7 +24,7 @@ // Boston, MA 02111-1307, USA. @@ -664,9 +668,9 @@ diff -Naur glib/Opaque.cs glib-sharp/Opaque.cs using System; using System.Collections; -diff -Naur glib/ParamSpec.cs glib-sharp/ParamSpec.cs ---- glib/ParamSpec.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/ParamSpec.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/ParamSpec.cs glib-sharp/ParamSpec.cs +--- glib-sharp-upstream/ParamSpec.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/ParamSpec.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,50 +19,49 @@ // Boston, MA 02111-1307, USA. @@ -806,9 +810,9 @@ diff -Naur glib/ParamSpec.cs glib-sharp/ParamSpec.cs ParamFlags flags; public IntPtr value_type; IntPtr owner_type; -diff -Naur glib/Priority.cs glib-sharp/Priority.cs ---- glib/Priority.cs 2009-05-03 21:34:22.000000000 +0200 -+++ glib-sharp/Priority.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Priority.cs glib-sharp/Priority.cs +--- glib-sharp-upstream/Priority.cs 2009-05-03 21:34:22.000000000 +0200 ++++ glib-sharp/Priority.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. @@ -818,9 +822,9 @@ diff -Naur glib/Priority.cs glib-sharp/Priority.cs public enum Priority { High = -100, -diff -Naur glib/PropertyAttribute.cs glib-sharp/PropertyAttribute.cs ---- glib/PropertyAttribute.cs 2008-06-06 18:55:00.000000000 +0200 -+++ glib-sharp/PropertyAttribute.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/PropertyAttribute.cs glib-sharp/PropertyAttribute.cs +--- glib-sharp-upstream/PropertyAttribute.cs 2008-06-06 18:55:00.000000000 +0200 ++++ glib-sharp/PropertyAttribute.cs 2009-09-11 08:35:22.000000000 +0200 @@ -17,7 +17,7 @@ // Boston, MA 02111-1307, USA. @@ -830,9 +834,9 @@ diff -Naur glib/PropertyAttribute.cs glib-sharp/PropertyAttribute.cs using System; -diff -Naur glib/PtrArray.cs glib-sharp/PtrArray.cs ---- glib/PtrArray.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/PtrArray.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/PtrArray.cs glib-sharp/PtrArray.cs +--- glib-sharp-upstream/PtrArray.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/PtrArray.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -842,9 +846,9 @@ diff -Naur glib/PtrArray.cs glib-sharp/PtrArray.cs using System; using System.Collections; -diff -Naur glib/SignalArgs.cs glib-sharp/SignalArgs.cs ---- glib/SignalArgs.cs 2004-06-25 20:42:19.000000000 +0200 -+++ glib-sharp/SignalArgs.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/SignalArgs.cs glib-sharp/SignalArgs.cs +--- glib-sharp-upstream/SignalArgs.cs 2004-06-25 20:42:19.000000000 +0200 ++++ glib-sharp/SignalArgs.cs 2009-09-11 08:35:22.000000000 +0200 @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -854,9 +858,9 @@ diff -Naur glib/SignalArgs.cs glib-sharp/SignalArgs.cs using System; using System.Collections; -diff -Naur glib/SignalAttribute.cs glib-sharp/SignalAttribute.cs ---- glib/SignalAttribute.cs 2005-10-08 23:08:04.000000000 +0200 -+++ glib-sharp/SignalAttribute.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/SignalAttribute.cs glib-sharp/SignalAttribute.cs +--- glib-sharp-upstream/SignalAttribute.cs 2005-10-08 23:08:04.000000000 +0200 ++++ glib-sharp/SignalAttribute.cs 2009-09-11 08:35:22.000000000 +0200 @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -866,9 +870,9 @@ diff -Naur glib/SignalAttribute.cs glib-sharp/SignalAttribute.cs using System; -diff -Naur glib/SignalCallback.cs glib-sharp/SignalCallback.cs ---- glib/SignalCallback.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/SignalCallback.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/SignalCallback.cs glib-sharp/SignalCallback.cs +--- glib-sharp-upstream/SignalCallback.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/SignalCallback.cs 2009-09-11 08:35:22.000000000 +0200 @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -878,9 +882,9 @@ diff -Naur glib/SignalCallback.cs glib-sharp/SignalCallback.cs using System; using System.Collections; using System.Runtime.InteropServices; -diff -Naur glib/SignalClosure.cs glib-sharp/SignalClosure.cs ---- glib/SignalClosure.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/SignalClosure.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/SignalClosure.cs glib-sharp/SignalClosure.cs +--- glib-sharp-upstream/SignalClosure.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/SignalClosure.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -890,9 +894,9 @@ diff -Naur glib/SignalClosure.cs glib-sharp/SignalClosure.cs using System; using System.Collections; -diff -Naur glib/Signal.cs glib-sharp/Signal.cs ---- glib/Signal.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Signal.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Signal.cs glib-sharp/Signal.cs +--- glib-sharp-upstream/Signal.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Signal.cs 2009-09-11 08:35:22.000000000 +0200 @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. @@ -902,9 +906,9 @@ diff -Naur glib/Signal.cs glib-sharp/Signal.cs using System; using System.Collections; -diff -Naur glib/SList.cs glib-sharp/SList.cs ---- glib/SList.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/SList.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/SList.cs glib-sharp/SList.cs +--- glib-sharp-upstream/SList.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/SList.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -914,9 +918,9 @@ diff -Naur glib/SList.cs glib-sharp/SList.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/Source.cs glib-sharp/Source.cs ---- glib/Source.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Source.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Source.cs glib-sharp/Source.cs +--- glib-sharp-upstream/Source.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Source.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -926,9 +930,9 @@ diff -Naur glib/Source.cs glib-sharp/Source.cs using System; using System.Collections; -diff -Naur glib/Spawn.cs glib-sharp/Spawn.cs ---- glib/Spawn.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Spawn.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Spawn.cs glib-sharp/Spawn.cs +--- glib-sharp-upstream/Spawn.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Spawn.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -938,9 +942,9 @@ diff -Naur glib/Spawn.cs glib-sharp/Spawn.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/Thread.cs glib-sharp/Thread.cs ---- glib/Thread.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Thread.cs 2009-09-03 10:59:53.000000000 +0200 +diff -Naur glib-sharp-upstream/Thread.cs glib-sharp/Thread.cs +--- glib-sharp-upstream/Thread.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Thread.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -967,9 +971,9 @@ diff -Naur glib/Thread.cs glib-sharp/Thread.cs } } } -diff -Naur glib/Timeout.cs glib-sharp/Timeout.cs ---- glib/Timeout.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Timeout.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Timeout.cs glib-sharp/Timeout.cs +--- glib-sharp-upstream/Timeout.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Timeout.cs 2009-09-11 08:35:22.000000000 +0200 @@ -22,7 +22,7 @@ // Boston, MA 02111-1307, USA. @@ -979,9 +983,9 @@ diff -Naur glib/Timeout.cs glib-sharp/Timeout.cs using System; using System.Collections; -diff -Naur glib/ToggleRef.cs glib-sharp/ToggleRef.cs ---- glib/ToggleRef.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/ToggleRef.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/ToggleRef.cs glib-sharp/ToggleRef.cs +--- glib-sharp-upstream/ToggleRef.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/ToggleRef.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -991,9 +995,9 @@ diff -Naur glib/ToggleRef.cs glib-sharp/ToggleRef.cs using System; using System.Collections; -diff -Naur glib/TypeConverter.cs glib-sharp/TypeConverter.cs ---- glib/TypeConverter.cs 2005-05-04 18:54:24.000000000 +0200 -+++ glib-sharp/TypeConverter.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/TypeConverter.cs glib-sharp/TypeConverter.cs +--- glib-sharp-upstream/TypeConverter.cs 2005-05-04 18:54:24.000000000 +0200 ++++ glib-sharp/TypeConverter.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -1003,9 +1007,9 @@ diff -Naur glib/TypeConverter.cs glib-sharp/TypeConverter.cs using System; public class TypeConverter { -diff -Naur glib/TypeFundamentals.cs glib-sharp/TypeFundamentals.cs ---- glib/TypeFundamentals.cs 2004-07-09 17:25:39.000000000 +0200 -+++ glib-sharp/TypeFundamentals.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/TypeFundamentals.cs glib-sharp/TypeFundamentals.cs +--- glib-sharp-upstream/TypeFundamentals.cs 2004-07-09 17:25:39.000000000 +0200 ++++ glib-sharp/TypeFundamentals.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -1015,9 +1019,9 @@ diff -Naur glib/TypeFundamentals.cs glib-sharp/TypeFundamentals.cs public enum TypeFundamentals { TypeInvalid = 0 << 2, -diff -Naur glib/TypeInitializerAttribute.cs glib-sharp/TypeInitializerAttribute.cs ---- glib/TypeInitializerAttribute.cs 2007-09-07 16:40:46.000000000 +0200 -+++ glib-sharp/TypeInitializerAttribute.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/TypeInitializerAttribute.cs glib-sharp/TypeInitializerAttribute.cs +--- glib-sharp-upstream/TypeInitializerAttribute.cs 2007-09-07 16:40:46.000000000 +0200 ++++ glib-sharp/TypeInitializerAttribute.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -1027,9 +1031,9 @@ diff -Naur glib/TypeInitializerAttribute.cs glib-sharp/TypeInitializerAttribute. using System; -diff -Naur glib/UnwrappedObject.cs glib-sharp/UnwrappedObject.cs ---- glib/UnwrappedObject.cs 2005-07-22 20:36:50.000000000 +0200 -+++ glib-sharp/UnwrappedObject.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/UnwrappedObject.cs glib-sharp/UnwrappedObject.cs +--- glib-sharp-upstream/UnwrappedObject.cs 2005-07-22 20:36:50.000000000 +0200 ++++ glib-sharp/UnwrappedObject.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -1039,9 +1043,9 @@ diff -Naur glib/UnwrappedObject.cs glib-sharp/UnwrappedObject.cs using System; using System.Runtime.InteropServices; -diff -Naur glib/ValueArray.cs glib-sharp/ValueArray.cs ---- glib/ValueArray.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/ValueArray.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/ValueArray.cs glib-sharp/ValueArray.cs +--- glib-sharp-upstream/ValueArray.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/ValueArray.cs 2009-09-11 08:35:22.000000000 +0200 @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. @@ -1051,9 +1055,9 @@ diff -Naur glib/ValueArray.cs glib-sharp/ValueArray.cs using System; using System.Collections; -diff -Naur glib/Value.cs glib-sharp/Value.cs ---- glib/Value.cs 2009-09-02 22:17:37.000000000 +0200 -+++ glib-sharp/Value.cs 2009-09-03 10:41:01.000000000 +0200 +diff -Naur glib-sharp-upstream/Value.cs glib-sharp/Value.cs +--- glib-sharp-upstream/Value.cs 2009-09-03 21:50:53.000000000 +0200 ++++ glib-sharp/Value.cs 2009-09-11 08:35:22.000000000 +0200 @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA.