[goffice] Compilation: eliminate some wrong and potentially harmful G_GNUC_CONST
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] Compilation: eliminate some wrong and potentially harmful G_GNUC_CONST
- Date: Thu, 17 Sep 2015 21:34:52 +0000 (UTC)
commit d5b68e2c3004427d211c5384278a530964c581e2
Author: Morten Welinder <terra gnome org>
Date: Thu Sep 17 17:34:03 2015 -0400
Compilation: eliminate some wrong and potentially harmful G_GNUC_CONST
Copy-and-paste of ancient code has propagated these.
goffice/canvas/goc-widget.c | 2 +-
goffice/graph/gog-child-button.h | 2 +-
goffice/gtk/go-optionmenu.h | 2 +-
goffice/gtk/go-palette.h | 2 +-
goffice/gtk/go-selector.h | 2 +-
goffice/utils/go-geometry.h | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/goffice/canvas/goc-widget.c b/goffice/canvas/goc-widget.c
index e7b3b7d..9edb865 100644
--- a/goffice/canvas/goc-widget.c
+++ b/goffice/canvas/goc-widget.c
@@ -56,7 +56,7 @@ struct _GocOffscreenBoxClass
GtkBinClass parent_class;
};
-GType goc_offscreen_box_get_type (void) G_GNUC_CONST;
+static GType goc_offscreen_box_get_type (void);
static void
to_child (GocOffscreenBox *offscreen_box,
diff --git a/goffice/graph/gog-child-button.h b/goffice/graph/gog-child-button.h
index 8a61d5e..6baa53e 100644
--- a/goffice/graph/gog-child-button.h
+++ b/goffice/graph/gog-child-button.h
@@ -37,7 +37,7 @@ typedef struct _GogChildButtonClass GogChildButtonClass;
#define GOG_IS_CHILD_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GOG_TYPE_CHILD_BUTTON))
#define GOG_CHILD_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GOG_TYPE_CHILD_BUTTON,
GogChildButtonClass))
-GType gog_child_button_get_type (void) G_GNUC_CONST;
+GType gog_child_button_get_type (void);
GtkWidget *gog_child_button_new (void);
void gog_child_button_set_object (GogChildButton *child_button, GogObject *gog_object);
diff --git a/goffice/gtk/go-optionmenu.h b/goffice/gtk/go-optionmenu.h
index e068e1f..8046a7c 100644
--- a/goffice/gtk/go-optionmenu.h
+++ b/goffice/gtk/go-optionmenu.h
@@ -73,7 +73,7 @@ struct _GOOptionMenuClass
};
-GType go_option_menu_get_type (void) G_GNUC_CONST;
+GType go_option_menu_get_type (void);
GtkWidget *go_option_menu_new (void);
GtkWidget *go_option_menu_build (const char *first_entry, ...);
diff --git a/goffice/gtk/go-palette.h b/goffice/gtk/go-palette.h
index b0de890..68195a8 100644
--- a/goffice/gtk/go-palette.h
+++ b/goffice/gtk/go-palette.h
@@ -62,7 +62,7 @@ struct _GOPaletteClass
void (*custom_activate) (GtkWidget *palette);
};
-GType go_palette_get_type (void) G_GNUC_CONST;
+GType go_palette_get_type (void);
GtkWidget *go_palette_new (int n_swatches,
double swatch_width,
int n_columns,
diff --git a/goffice/gtk/go-selector.h b/goffice/gtk/go-selector.h
index 7310aaa..cfa43db 100644
--- a/goffice/gtk/go-selector.h
+++ b/goffice/gtk/go-selector.h
@@ -52,7 +52,7 @@ struct _GOSelectorClass
void (*activate) (GtkWidget *selector);
};
-GType go_selector_get_type (void) G_GNUC_CONST;
+GType go_selector_get_type (void);
GtkWidget *go_selector_new (GOPalette *palette);
diff --git a/goffice/utils/go-geometry.h b/goffice/utils/go-geometry.h
index db1e95a..13a164e 100644
--- a/goffice/utils/go-geometry.h
+++ b/goffice/utils/go-geometry.h
@@ -109,7 +109,7 @@ GOGeometrySide go_geometry_calc_label_position (GOGeometryOBR *obr, double
alph
GOGeometrySide side, GOGeometrySide anchor);
#define GO_TYPE_DIRECTION (go_direction_get_type())
-GType go_direction_get_type (void) G_GNUC_CONST;
+GType go_direction_get_type (void);
gboolean go_direction_is_horizontal (GODirection d);
gboolean go_direction_is_forward (GODirection d);
char const *go_direction_get_name (GODirection d);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]