]>
Commit | Line | Data |
---|---|---|
964d5f7e JK |
1 | diff -dur Glib-1.020.orig/GObject.xs Glib-1.020/GObject.xs |
2 | --- Glib-1.020.orig/GObject.xs 2003-11-21 07:31:28.000000000 +0100 | |
3 | +++ Glib-1.020/GObject.xs 2004-01-09 15:31:47.869709011 +0100 | |
4 | @@ -326,7 +326,7 @@ | |
5 | nowarn_by_type = g_hash_table_new (g_direct_hash, | |
6 | g_direct_equal); | |
7 | } | |
8 | - g_hash_table_insert (nowarn_by_type, (gpointer)gtype, (gpointer)nowarn); | |
9 | + g_hash_table_insert (nowarn_by_type, GINT_TO_POINTER(gtype), GINT_TO_POINTER(nowarn)); | |
10 | ||
11 | G_UNLOCK (nowarn_by_type); | |
12 | } | |
13 | @@ -341,8 +341,9 @@ | |
14 | if (!nowarn_by_type) | |
15 | result = FALSE; | |
16 | else | |
17 | - result = (gboolean) g_hash_table_lookup (nowarn_by_type, | |
18 | - (gpointer)gtype); | |
19 | + result = (gboolean) GPOINTER_TO_INT( | |
20 | + g_hash_table_lookup (nowarn_by_type, | |
21 | + GINT_TO_POINTER(gtype))); | |
22 | ||
23 | G_UNLOCK (nowarn_by_type); | |
24 | ||
25 | @@ -1067,7 +1068,7 @@ | |
26 | =cut | |
27 | SV * | |
28 | new_from_pointer (class, pointer, noinc=FALSE) | |
29 | - guint32 pointer | |
30 | + gpointer pointer | |
31 | gboolean noinc | |
32 | CODE: | |
33 | RETVAL = gperl_new_object (G_OBJECT (pointer), noinc); | |
34 | @@ -1080,11 +1081,11 @@ | |
35 | Complement of C<new_from_pointer>. | |
36 | ||
37 | =cut | |
38 | -guint32 | |
39 | +gpointer | |
40 | get_pointer (object) | |
41 | GObject * object | |
42 | CODE: | |
43 | - RETVAL = GPOINTER_TO_UINT (object); | |
44 | + RETVAL = object; | |
45 | OUTPUT: | |
46 | RETVAL | |
47 | ||
48 | diff -dur Glib-1.020.orig/GType.xs Glib-1.020/GType.xs | |
49 | --- Glib-1.020.orig/GType.xs 2003-11-29 04:03:12.000000000 +0100 | |
50 | +++ Glib-1.020/GType.xs 2004-01-09 15:32:08.569779901 +0100 | |
51 | @@ -611,7 +611,7 @@ | |
52 | GSignalQuery query; | |
53 | gchar * tmp; | |
54 | SV * method_name; | |
55 | - guint i; | |
56 | + STRLEN i; | |
57 | HV *stash; | |
58 | SV **slot; | |
59 | /* see GClosure.xs and gperl_marshal.h for an explanation. we can't | |
60 | Only in Glib-1.020: GType.xs~ | |
61 | diff -dur Glib-1.020.orig/Glib.xs Glib-1.020/Glib.xs | |
62 | --- Glib-1.020.orig/Glib.xs 2003-11-29 04:03:12.000000000 +0100 | |
63 | +++ Glib-1.020/Glib.xs 2004-01-09 15:31:47.869709011 +0100 | |
64 | @@ -182,7 +182,7 @@ | |
65 | { | |
66 | GError *error = 0; | |
67 | SV *sv; | |
68 | - int len; | |
69 | + gssize len; | |
70 | gchar *str = g_filename_to_utf8 (filename, -1, NULL, &len, &error); | |
71 | ||
72 | if (!filename) | |
73 | diff -dur Glib-1.020.orig/typemap Glib-1.020/typemap | |
74 | --- Glib-1.020.orig/typemap 2003-11-21 07:31:28.000000000 +0100 | |
75 | +++ Glib-1.020/typemap 2004-01-09 15:31:47.870708773 +0100 | |
76 | @@ -47,6 +47,7 @@ | |
77 | const guchar * T_PV | |
78 | gfloat T_FLOAT | |
79 | gdouble T_DOUBLE | |
80 | +gpointer T_PTR | |
81 | ||
82 | GObject* T_GPERL_GENERIC_WRAPPER | |
83 | GObject_ornull* T_GPERL_GENERIC_WRAPPER |