diff --git a/ChangeLog b/ChangeLog index 609fab9da..7f822c45f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-02-12 Zoltan Varga + + * glib/time_t_CustomMarshaler.cs: Update after custom marshaling + changes. + 2004-02-11 Mike Kestner * gtk/Gtk.metadata : hide the GSList API diff --git a/glib/time_t_CustomMarshaler.cs b/glib/time_t_CustomMarshaler.cs index 6158122c3..ec46f3284 100644 --- a/glib/time_t_CustomMarshaler.cs +++ b/glib/time_t_CustomMarshaler.cs @@ -53,15 +53,15 @@ namespace GLib { public object MarshalNativeToManaged (IntPtr data) { - int secs; + long secs; if (GetNativeDataSize () == 4) - secs = Marshal.ReadInt32 (data); + secs = (int)data; else if (GetNativeDataSize () == 8) - secs = (int) Marshal.ReadInt64 (data); + secs = (long)data; else throw new Exception ("Unexpected native size for time_t."); - TimeSpan span = new TimeSpan (secs - utc_offset); + TimeSpan span = new TimeSpan ((int)secs - utc_offset); return local_epoch.Add (span); }