X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fhelper.h;h=6a9605f0228e59b1e28e2dcfe47b88e6e9567ccb;hb=9d4b6c71c0cd089bb94296fab50a703735b89ccd;hp=c1d93a8c033dbc5db277a74e9a109251a2bbd654;hpb=f9f8fdb02ec2d1721a3529a42d57415ea55e049b;p=pspp

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index c1d93a8c03..6a9605f022 100644
--- a/src/ui/gui/helper.h
+++ b/src/ui/gui/helper.h
@@ -45,13 +45,12 @@ null_if_empty_param (const gchar *name, const gchar *nick,
 }
 
 gchar * value_to_text (union value v, const struct variable *);
-gchar * value_to_text__ (union value v, const struct fmt_spec *,
-                         const char *encoding);
+gchar * value_to_text__ (union value v, struct fmt_spec, const char *encoding);
 
 
 union value *text_to_value (const gchar *text, const struct variable *,
                             union value *);
-union value *text_to_value__ (const gchar *text, const struct fmt_spec *,
+union value *text_to_value__ (const gchar *text, struct fmt_spec,
                               const gchar *encoding, union value *);
 
 /* Create a deep copy of SRC */
@@ -65,5 +64,18 @@ psppire_box_pack_start_defaults (GtkBox *box, GtkWidget *widget)
   gtk_box_pack_start (box, widget, TRUE, TRUE, 0);
 }
 
+/* Starting with gcc8 the warning Wcast-function-type will
+   trigger if no intermediate (void (*)(void)) cast is done
+   for a function cast to GFunc when the number of parameters
+   is not 2. The reason is that the compiler behaviour in this
+   situation is undefined according to C standard although many
+   implementations rely on this. */
+#define GFUNC_COMPAT_CAST(x) ((GFunc) (void (*)(void)) (x))
+
+
+/* Return the width of an upper case M (in pixels) when rendered onto
+   WIDGET with its current style.  */
+gdouble width_of_m (GtkWidget *widget);
+
 #endif