Mercurial > hg > xemacs-beta
diff src/emacs-marshals.c @ 2054:91d4c8c65a0f
[xemacs-hg @ 2004-05-02 04:06:51 by malcolmp]
Fix warnings and errors when building GTK using C++ and --use-union-type.
author | malcolmp |
---|---|
date | Sun, 02 May 2004 04:07:01 +0000 |
parents | ee2d33cfc3c1 |
children | de9952d2ed18 |
line wrap: on
line diff
--- a/src/emacs-marshals.c Sat May 01 21:50:40 2004 +0000 +++ b/src/emacs-marshals.c Sun May 02 04:07:01 2004 +0000 @@ -120,7 +120,7 @@ emacs_gtk_marshal_INT__BOOL (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[1]); *return_val = (*rfunc) (GTK_VALUE_BOOL (args[0])); @@ -130,7 +130,7 @@ emacs_gtk_marshal_INT__OBJECT_ARRAY (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[2]); *return_val = (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_ARRAY (args[1])); @@ -140,7 +140,7 @@ emacs_gtk_marshal_INT__OBJECT_INT_ARRAY (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[3]); *return_val = (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_INT (args[1]), GTK_VALUE_ARRAY (args[2])); @@ -150,7 +150,7 @@ emacs_gtk_marshal_INT__OBJECT_INT_INT (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[3]); *return_val = (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_INT (args[1]), GTK_VALUE_INT (args[2])); @@ -160,7 +160,7 @@ emacs_gtk_marshal_INT__OBJECT_INT_STRING (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[3]); *return_val = (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_INT (args[1]), GTK_VALUE_STRING (args[2])); @@ -170,7 +170,7 @@ emacs_gtk_marshal_INT__OBJECT_INT (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[2]); *return_val = (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_INT (args[1])); @@ -180,7 +180,7 @@ emacs_gtk_marshal_INT__OBJECT_OBJECT (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[2]); *return_val = (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_OBJECT (args[1])); @@ -190,7 +190,7 @@ emacs_gtk_marshal_INT__OBJECT_POINTER_INT_INT (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[4]); *return_val = (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_POINTER (args[1]), GTK_VALUE_INT (args[2]), GTK_VALUE_INT (args[3])); @@ -200,7 +200,7 @@ emacs_gtk_marshal_INT__OBJECT_POINTER_INT (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[3]); *return_val = (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_POINTER (args[1]), GTK_VALUE_INT (args[2])); @@ -210,7 +210,7 @@ emacs_gtk_marshal_INT__OBJECT_POINTER (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[2]); *return_val = (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_POINTER (args[1])); @@ -220,7 +220,7 @@ emacs_gtk_marshal_INT__OBJECT_STRING (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[2]); *return_val = (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_STRING (args[1])); @@ -230,7 +230,7 @@ emacs_gtk_marshal_INT__OBJECT (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[1]); *return_val = (*rfunc) (GTK_VALUE_OBJECT (args[0])); @@ -240,7 +240,7 @@ emacs_gtk_marshal_INT__POINTER_INT (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[2]); *return_val = (*rfunc) (GTK_VALUE_POINTER (args[0]), GTK_VALUE_INT (args[1])); @@ -250,7 +250,7 @@ emacs_gtk_marshal_INT__POINTER_STRING_INT (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[3]); *return_val = (*rfunc) (GTK_VALUE_POINTER (args[0]), GTK_VALUE_STRING (args[1]), GTK_VALUE_INT (args[2])); @@ -260,7 +260,7 @@ emacs_gtk_marshal_INT__POINTER_STRING_STRING (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[3]); *return_val = (*rfunc) (GTK_VALUE_POINTER (args[0]), GTK_VALUE_STRING (args[1]), GTK_VALUE_STRING (args[2])); @@ -270,7 +270,7 @@ emacs_gtk_marshal_INT__POINTER_STRING (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[2]); *return_val = (*rfunc) (GTK_VALUE_POINTER (args[0]), GTK_VALUE_STRING (args[1])); @@ -280,7 +280,7 @@ emacs_gtk_marshal_INT__POINTER (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[1]); *return_val = (*rfunc) (GTK_VALUE_POINTER (args[0])); @@ -290,7 +290,7 @@ emacs_gtk_marshal_INT__STRING_STRING_INT_ARRAY (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[4]); *return_val = (*rfunc) (GTK_VALUE_STRING (args[0]), GTK_VALUE_STRING (args[1]), GTK_VALUE_INT (args[2]), GTK_VALUE_ARRAY (args[3])); @@ -300,7 +300,7 @@ emacs_gtk_marshal_INT__STRING (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[1]); *return_val = (*rfunc) (GTK_VALUE_STRING (args[0])); @@ -310,7 +310,7 @@ emacs_gtk_marshal_INT__NONE (ffi_actual_function func, GtkArg *args) { __INT_fn rfunc = (__INT_fn) func; - guint *return_val; + gint *return_val; return_val = GTK_RETLOC_INT (args[0]); *return_val = (*rfunc) (); @@ -424,7 +424,7 @@ __NONE_fn rfunc = (__NONE_fn) func; (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_INT (args[1]), GTK_VALUE_BOOL (args[2])); } -typedef void (*__NONE__OBJECT_INT_FLOAT_BOOL_fn)(GtkObject *, guint, gfloat, gboolean); +typedef void (*__NONE__OBJECT_INT_FLOAT_BOOL_fn)(GtkObject *, gint, gfloat, gboolean); static void emacs_gtk_marshal_NONE__OBJECT_INT_FLOAT_BOOL (ffi_actual_function func, GtkArg *args) @@ -432,7 +432,7 @@ __NONE__OBJECT_INT_FLOAT_BOOL_fn rfunc = (__NONE__OBJECT_INT_FLOAT_BOOL_fn) func; (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_INT (args[1]), GTK_VALUE_FLOAT (args[2]), GTK_VALUE_BOOL (args[3])); } -typedef void (*__NONE__OBJECT_INT_FLOAT_fn)(GtkObject *, guint, gfloat); +typedef void (*__NONE__OBJECT_INT_FLOAT_fn)(GtkObject *, gint, gfloat); static void emacs_gtk_marshal_NONE__OBJECT_INT_FLOAT (ffi_actual_function func, GtkArg *args) @@ -454,7 +454,7 @@ __NONE_fn rfunc = (__NONE_fn) func; (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_INT (args[1]), GTK_VALUE_INT (args[2]), GTK_VALUE_ARRAY (args[3])); } -typedef void (*__NONE__OBJECT_INT_INT_FLOAT_FLOAT_fn)(GtkObject *, guint, guint, gfloat, gfloat); +typedef void (*__NONE__OBJECT_INT_INT_FLOAT_FLOAT_fn)(GtkObject *, gint, gint, gfloat, gfloat); static void emacs_gtk_marshal_NONE__OBJECT_INT_INT_FLOAT_FLOAT (ffi_actual_function func, GtkArg *args) @@ -574,7 +574,7 @@ __NONE_fn rfunc = (__NONE_fn) func; (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_OBJECT (args[1]), GTK_VALUE_BOOL (args[2]), GTK_VALUE_BOOL (args[3])); } -typedef void (*__NONE__OBJECT_OBJECT_FLOAT_INT_fn)(GtkObject *, GtkObject *, gfloat, guint); +typedef void (*__NONE__OBJECT_OBJECT_FLOAT_INT_fn)(GtkObject *, GtkObject *, gfloat, gint); static void emacs_gtk_marshal_NONE__OBJECT_OBJECT_FLOAT_INT (ffi_actual_function func, GtkArg *args) @@ -701,7 +701,7 @@ __NONE_fn rfunc = (__NONE_fn) func; (*rfunc) (GTK_VALUE_OBJECT (args[0]), GTK_VALUE_POINTER (args[1]), GTK_VALUE_BOOL (args[2])); } -typedef void (*__NONE__OBJECT_POINTER_INT_FLOAT_FLOAT_fn)(GtkObject *, void *, guint, gfloat, gfloat); +typedef void (*__NONE__OBJECT_POINTER_INT_FLOAT_FLOAT_fn)(GtkObject *, void *, gint, gfloat, gfloat); static void emacs_gtk_marshal_NONE__OBJECT_POINTER_INT_FLOAT_FLOAT (ffi_actual_function func, GtkArg *args) @@ -1070,7 +1070,7 @@ return_val = GTK_RETLOC_OBJECT (args[1]); *return_val = (*rfunc) (GTK_VALUE_INT (args[0])); } -typedef GtkObject * (*__OBJECT__OBJECT_FLOAT_INT_fn)(GtkObject *, gfloat, guint); +typedef GtkObject * (*__OBJECT__OBJECT_FLOAT_INT_fn)(GtkObject *, gfloat, gint); static void emacs_gtk_marshal_OBJECT__OBJECT_FLOAT_INT (ffi_actual_function func, GtkArg *args)