From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 25 Mar 2008 09:19:28 +0000 (+0000)
Subject: Remove inline qualifiers to keep gcc 4.2 happy
X-Git-Tag: v0.6.0~45
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f404544337964f80bb2d1fee5acb147f7023bc08;p=pspp-builds.git

Remove inline qualifiers to keep gcc 4.2 happy
---

diff --git a/lib/gtksheet/gsheet-column-iface.c b/lib/gtksheet/gsheet-column-iface.c
index 36fb5e21..1cd7996d 100644
--- a/lib/gtksheet/gsheet-column-iface.c
+++ b/lib/gtksheet/gsheet-column-iface.c
@@ -41,7 +41,7 @@ static guint sheet_column_signals[LAST_SIGNAL];
 static void      g_sheet_column_base_init   (gpointer g_class);
 
 
-inline GType
+GType
 g_sheet_column_get_type (void)
 {
   static GType sheet_column_type = 0;
@@ -100,7 +100,7 @@ g_sheet_column_base_init (gpointer g_class)
 }
 
 
-inline void
+void
 g_sheet_column_set_width (GSheetColumn *column, glong col, gint size)
 {
   g_return_if_fail (G_IS_SHEET_COLUMN (column));
@@ -110,7 +110,7 @@ g_sheet_column_set_width (GSheetColumn *column, glong col, gint size)
 }
 
 
-inline gint
+gint
 g_sheet_column_get_width (const GSheetColumn *column, glong col)
 {
   g_return_val_if_fail (G_IS_SHEET_COLUMN (column), -1);
@@ -122,7 +122,7 @@ g_sheet_column_get_width (const GSheetColumn *column, glong col)
 
 
 
-inline gboolean
+gboolean
 g_sheet_column_get_visibility(const GSheetColumn *column,
 					    glong col)
 {
@@ -135,7 +135,7 @@ g_sheet_column_get_visibility(const GSheetColumn *column,
 
 }
 
-inline gboolean
+gboolean
 g_sheet_column_get_sensitivity(const GSheetColumn *column,
 					     glong col)
 {
@@ -149,7 +149,7 @@ g_sheet_column_get_sensitivity(const GSheetColumn *column,
 }
 
 
-inline GtkSheetButton *
+GtkSheetButton *
 g_sheet_column_get_button(const GSheetColumn *column,
 			      glong col)
 {
@@ -165,7 +165,7 @@ g_sheet_column_get_button(const GSheetColumn *column,
   return button;
 }
 
-inline GtkJustification
+GtkJustification
 g_sheet_column_get_justification(const GSheetColumn *column,
 				     glong col)
 {
@@ -176,7 +176,7 @@ g_sheet_column_get_justification(const GSheetColumn *column,
   return (G_SHEET_COLUMN_GET_IFACE (column)->get_justification) (column, col);
 }
 
-inline gchar *
+gchar *
 g_sheet_column_get_subtitle (const GSheetColumn *column, glong col)
 {
   g_return_val_if_fail (G_IS_SHEET_COLUMN (column), NULL);
@@ -189,7 +189,7 @@ g_sheet_column_get_subtitle (const GSheetColumn *column, glong col)
 
 
 
-inline gint
+gint
 g_sheet_column_get_left_text_column (const GSheetColumn *column,
 					 glong col)
 {
@@ -202,7 +202,7 @@ g_sheet_column_get_left_text_column (const GSheetColumn *column,
 
 }
 
-inline gint
+gint
 g_sheet_column_get_right_text_column (const GSheetColumn *column,
 					  glong col)
 {
@@ -215,7 +215,7 @@ g_sheet_column_get_right_text_column (const GSheetColumn *column,
 
 }
 
-inline void
+void
 g_sheet_column_set_left_text_column (const GSheetColumn *column,
 					 glong col, gint i)
 {
@@ -227,7 +227,7 @@ g_sheet_column_set_left_text_column (const GSheetColumn *column,
 }
 
 
-inline void
+void
 g_sheet_column_set_right_text_column (const GSheetColumn *column,
 					  glong col, gint i)
 {
@@ -237,7 +237,7 @@ g_sheet_column_set_right_text_column (const GSheetColumn *column,
     (G_SHEET_COLUMN_GET_IFACE (column)->set_right_text_column) (column, col, i);
 }
 
-inline glong
+glong
 g_sheet_column_get_column_count(const GSheetColumn *geo)
 {
   g_return_val_if_fail (G_IS_SHEET_COLUMN (geo), -1);
@@ -247,7 +247,7 @@ g_sheet_column_get_column_count(const GSheetColumn *geo)
   return (G_SHEET_COLUMN_GET_IFACE (geo)->get_column_count) (geo);
 }
 
-inline gint
+gint
 g_sheet_column_start_pixel(const GSheetColumn *geo, glong col)
 {
   gint i;
@@ -269,7 +269,7 @@ g_sheet_column_start_pixel(const GSheetColumn *geo, glong col)
 
 
 
-inline void
+void
 g_sheet_column_columns_changed(GSheetColumn *geo,
 				 glong first, glong n_columns)
 {
diff --git a/lib/gtksheet/gsheet-hetero-column.c b/lib/gtksheet/gsheet-hetero-column.c
index 0cda0cf3..ecc06cc5 100644
--- a/lib/gtksheet/gsheet-hetero-column.c
+++ b/lib/gtksheet/gsheet-hetero-column.c
@@ -226,7 +226,7 @@ g_sheet_hetero_column_set_button_label (GSheetHeteroColumn *geo,
 
 
 
-inline void
+void
 g_sheet_hetero_column_set_width (GSheetHeteroColumn *geo, glong i, gint size)
 {
   GSheetColumn *iface = G_SHEET_COLUMN (geo);
diff --git a/lib/gtksheet/gsheet-row-iface.c b/lib/gtksheet/gsheet-row-iface.c
index b56bfdde..1512737f 100644
--- a/lib/gtksheet/gsheet-row-iface.c
+++ b/lib/gtksheet/gsheet-row-iface.c
@@ -171,7 +171,7 @@ g_sheet_row_get_button(const GSheetRow *row_geo,
   return button;
 }
 
-inline gchar *
+gchar *
 g_sheet_row_get_subtitle (const GSheetRow *row_geo, glong row)
 {
   g_return_val_if_fail (G_IS_SHEET_ROW (row_geo), NULL);
diff --git a/lib/gtksheet/gsheetmodel.c b/lib/gtksheet/gsheetmodel.c
index 3fa8f0af..0d1a3f56 100644
--- a/lib/gtksheet/gsheetmodel.c
+++ b/lib/gtksheet/gsheetmodel.c
@@ -37,7 +37,7 @@ static guint sheet_model_signals[LAST_SIGNAL] = { 0 };
 static void      g_sheet_model_base_init   (gpointer           g_class);
 
 
-inline GType
+GType
 g_sheet_model_get_type (void)
 {
   static GType sheet_model_type = 0;
@@ -148,7 +148,7 @@ g_sheet_model_base_init (gpointer g_class)
  * Returns: True if strings obtained with get_string should be freed by the
  * sheet when no longer required.
  **/
-inline  gboolean
+gboolean
 g_sheet_model_free_strings (const GSheetModel *sheet_model)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (sheet_model), FALSE);
@@ -166,7 +166,7 @@ g_sheet_model_free_strings (const GSheetModel *sheet_model)
  * Retrieves the datum at location ROW, COLUMN in the form of a string.
  * Returns: The string representation of the datum, or NULL on error.
  **/
-inline gchar *
+gchar *
 g_sheet_model_get_string (const GSheetModel *sheet_model,
 			  glong row, glong column)
 {
@@ -335,7 +335,7 @@ g_sheet_model_columns_deleted (GSheetModel *sheet_model,
  *
  * Returns: TRUE if the cell is editable, FALSE otherwise
  **/
-inline gboolean
+gboolean
 g_sheet_model_is_editable (const GSheetModel *model,
 			     glong row, glong column)
 {
@@ -356,7 +356,7 @@ g_sheet_model_is_editable (const GSheetModel *model,
  *
  * Returns: TRUE if the cell is visible, FALSE otherwise
  **/
-inline gboolean
+gboolean
 g_sheet_model_is_visible (const GSheetModel *model,
 			  glong row, glong column)
 {
@@ -379,7 +379,7 @@ g_sheet_model_is_visible (const GSheetModel *model,
  * Returns the foreground colour of the cell at @row, @column
  * Returns: the foreground colour, or NULL on error.
  **/
-inline const GdkColor *
+const GdkColor *
 g_sheet_model_get_foreground (const GSheetModel *model,
 				glong row, glong column)
 {
@@ -401,7 +401,7 @@ g_sheet_model_get_foreground (const GSheetModel *model,
  * Returns the background colour of the cell at @row, @column
  * Returns: the background colour, or NULL on error.
  **/
-inline const GdkColor *
+const GdkColor *
 g_sheet_model_get_background (const GSheetModel *model,
 				glong row, glong column)
 {
@@ -423,7 +423,7 @@ g_sheet_model_get_background (const GSheetModel *model,
  * Returns the justification of the cell at @row, @column
  * Returns: the justification, or NULL on error.
  **/
-inline const GtkJustification *
+const GtkJustification *
 g_sheet_model_get_justification (const GSheetModel *model,
 				   glong row, glong column)
 {
@@ -445,7 +445,7 @@ g_sheet_model_get_justification (const GSheetModel *model,
  * Returns the font description of the cell at @row, @column
  * Returns: the font description, or NULL on error.
  **/
-inline const PangoFontDescription *
+const PangoFontDescription *
 g_sheet_model_get_font_desc(const GSheetModel *model,
 			      glong row, glong column)
 {
@@ -466,7 +466,7 @@ g_sheet_model_get_font_desc(const GSheetModel *model,
  * Returns the cell border of the cell at @row, @column
  * Returns: the cell border, or NULL on error.
  **/
-inline const GtkSheetCellBorder *
+const GtkSheetCellBorder *
 g_sheet_model_get_cell_border (const GSheetModel *model,
 				 glong row, glong column)
 {
@@ -486,7 +486,7 @@ g_sheet_model_get_cell_border (const GSheetModel *model,
  *
  * Returns the total number of columns represented by the model
  **/
-inline glong
+glong
 g_sheet_model_get_column_count (const GSheetModel *model)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), -1);
@@ -500,7 +500,7 @@ g_sheet_model_get_column_count (const GSheetModel *model)
  *
  * Returns the total number of rows represented by the model
  **/
-inline gint
+gint
 g_sheet_model_get_row_count(const GSheetModel *model)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), -1);
diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c
index 1987ab0a..d2db5800 100644
--- a/lib/gtksheet/gtksheet.c
+++ b/lib/gtksheet/gtksheet.c
@@ -7839,7 +7839,7 @@ gtk_sheet_button_new (void)
 }
 
 
-inline void
+void
 gtk_sheet_button_free (GtkSheetButton *button)
 {
   if (!button) return ;
diff --git a/src/libpspp/abt.c b/src/libpspp/abt.c
index 53e66f51..74b2ceb3 100644
--- a/src/libpspp/abt.c
+++ b/src/libpspp/abt.c
@@ -118,7 +118,7 @@ abt_insert (struct abt *abt, struct abt_node *node)
    the tree, if AFTER is true, or the last node, if AFTER is
    false. */
 static inline void
-insert_relative (struct abt *abt, struct abt_node *p, bool after,
+insert_relative (struct abt *abt, const struct abt_node *p, bool after,
                  struct abt_node *node)
 {
   node->down[0] = NULL;
@@ -145,8 +145,8 @@ insert_relative (struct abt *abt, struct abt_node *p, bool after,
           p = p->down[dir];
           dir = !after;
         }
-      p->down[dir] = node;
-      node->up = p;
+      ((struct abt_node *) p)->down[dir] = node;
+      node->up = (struct abt_node *) p;
       abt_reaugmented (abt, node);
     }
 
@@ -167,7 +167,7 @@ abt_insert_after (struct abt *abt,
                   const struct abt_node *p, struct abt_node *node)
 {
   assert (abt->compare == NULL);
-  insert_relative (abt, (struct abt_node *) p, true, node);
+  insert_relative (abt, p, true, node);
 }
 
 /* Inserts NODE before node P in ABT.
@@ -180,7 +180,7 @@ abt_insert_before (struct abt *abt,
                    const struct abt_node *p, struct abt_node *node)
 {
   assert (abt->compare == NULL);
-  insert_relative (abt, (struct abt_node *) p, false, node);
+  insert_relative (abt, p, false, node);
 }
 
 /* Deletes P from ABT. */
diff --git a/src/libpspp/hash.c b/src/libpspp/hash.c
index 9f1079a2..9da3deb1 100644
--- a/src/libpspp/hash.c
+++ b/src/libpspp/hash.c
@@ -449,7 +449,7 @@ hsh_sort_copy (struct hsh_table *h)
    to a pointer to that entry; otherwise returns a pointer to a
    NULL entry which *must* be used to insert a new entry having
    the same key data.  */
-inline void **
+void **
 hsh_probe (struct hsh_table *h, const void *target)
 {
   unsigned i;
diff --git a/src/ui/gui/psppire-case-file.c b/src/ui/gui/psppire-case-file.c
index 0fc7ab35..2edfec89 100644
--- a/src/ui/gui/psppire-case-file.c
+++ b/src/ui/gui/psppire-case-file.c
@@ -278,7 +278,7 @@ psppire_case_file_insert_case (PsppireCaseFile *cf,
 }
 
 
-inline casenumber
+casenumber
 psppire_case_file_get_case_count (const PsppireCaseFile *cf)
 {
   g_return_val_if_fail (cf, FALSE);
diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index d1470daf..afbe3d2f 100644
--- a/src/ui/gui/psppire-data-store.c
+++ b/src/ui/gui/psppire-data-store.c
@@ -68,7 +68,7 @@ enum  {FONT_CHANGED,
 static guint signals [n_SIGNALS];
 
 
-inline GType
+GType
 psppire_data_store_get_type (void)
 {
   static GType data_store_type = 0;
@@ -162,7 +162,7 @@ psppire_data_store_get_var_count (const GSheetModel *model)
   return psppire_dict_get_var_cnt (store->dict);
 }
 
-inline casenumber
+casenumber
 psppire_data_store_get_case_count (const PsppireDataStore *store)
 {
   return psppire_case_file_get_case_count (store->case_file);
@@ -174,7 +174,7 @@ psppire_data_store_get_value_count (const PsppireDataStore *store)
   return psppire_dict_get_value_cnt (store->dict);
 }
 
-inline casenumber
+casenumber
 psppire_data_store_get_case_count_wrapper (const GSheetModel *model)
 {
   const PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
diff --git a/src/ui/gui/psppire-data-store.h b/src/ui/gui/psppire-data-store.h
index f916ded8..55dcf068 100644
--- a/src/ui/gui/psppire-data-store.h
+++ b/src/ui/gui/psppire-data-store.h
@@ -142,7 +142,7 @@ gboolean psppire_data_store_set_string (PsppireDataStore *ds,
 					const gchar *text,
 					glong row, glong column);
 
-casenumber psppire_data_store_get_case_count (const PsppireDataStore *ds);
+inline casenumber psppire_data_store_get_case_count (const PsppireDataStore *ds);
 size_t psppire_data_store_get_value_count (const PsppireDataStore *ds);
 
 #ifdef __cplusplus
diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index db24bbf0..e6f1373a 100644
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -487,7 +487,7 @@ psppire_dict_check_name (const PsppireDict *dict,
 }
 
 
-inline gint
+gint
 psppire_dict_get_next_value_idx (const PsppireDict *dict)
 {
   return dict_get_next_value_idx (dict->dict);
diff --git a/src/ui/gui/psppire-dict.h b/src/ui/gui/psppire-dict.h
index 1bf8bd35..f645b355 100644
--- a/src/ui/gui/psppire-dict.h
+++ b/src/ui/gui/psppire-dict.h
@@ -96,7 +96,7 @@ void psppire_dict_resize_variable (PsppireDict *,
 gboolean psppire_dict_check_name (const PsppireDict *dict,
 			      const gchar *name, gboolean report);
 
-gint psppire_dict_get_next_value_idx (const PsppireDict *dict);
+inline gint psppire_dict_get_next_value_idx (const PsppireDict *dict);
 
 gboolean psppire_dict_rename_var (PsppireDict *dict, struct variable *v,
 			      const gchar *text);