Merge pull request #316 from oturpe/c23-compatibility

C23 compatibility
viking-gps · Feb 4, 2025 · 352bc19 · 352bc19
2 parents 1889b4f + d447c19
commit 352bc19
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/vikaggregatelayer.h b/src/vikaggregatelayer.h
@@ -45,7 +45,7 @@ GType vik_aggregate_layer_get_type ();
 typedef struct _VikAggregateLayer VikAggregateLayer;
 
 void vik_aggregate_layer_uninit ();
-VikAggregateLayer *vik_aggregate_layer_new ();
+VikAggregateLayer *vik_aggregate_layer_new ( VikViewport *vvp );
 void vik_aggregate_layer_add_layer ( VikAggregateLayer *val, VikLayer *l, gboolean allow_reordering );
 void vik_aggregate_layer_insert_layer ( VikAggregateLayer *val, VikLayer *l, VikLayer *crt_layer, gboolean allow_reordering );
 void vik_aggregate_layer_move_layer ( VikAggregateLayer *val, GtkTreeIter *child_iter, gboolean up );

diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c
@@ -659,7 +659,7 @@ static void vik_layers_panel_init ( VikLayersPanel *vlp )
   vlp->hbox = gtk_hbox_new ( TRUE, 2 );
   vlp->vt = vik_treeview_new ( );
 
-  vlp->toplayer = vik_aggregate_layer_new ();
+  vlp->toplayer = vik_aggregate_layer_new ( NULL );
   vik_layer_rename ( VIK_LAYER(vlp->toplayer), _("Top Layer"));
   g_signal_connect_swapped ( G_OBJECT(vlp->toplayer), "update", G_CALLBACK(layers_panel_emit_update), vlp );
 

diff --git a/test/test_file_load.c b/test/test_file_load.c
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
   // Seems to work without an $DISPLAY
   // Also get lots of warnings about no actual drawing GCs available
   // but for file processing this seems to be good enough
-  VikAggregateLayer* agg = vik_aggregate_layer_new ();
+  VikAggregateLayer* agg = vik_aggregate_layer_new ( NULL );
   VikViewport* vp = vik_viewport_new ();
 
   VikLoadType_t lt = a_file_load ( agg, vp, NULL, argv[1], TRUE, external, NULL );

diff --git a/test/vik2vik.c b/test/vik2vik.c
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
   // Also get lots of warnings about no actual drawing GCs available
   // but for file processing this seems to be good enough
   VikLoadType_t lt;
-  VikAggregateLayer* agg = vik_aggregate_layer_new ();
+  VikAggregateLayer* agg = vik_aggregate_layer_new ( NULL );
 #if GTK_CHECK_VERSION (3,0,0)
   VikWindow *vw = vik_window_new_window();
   VikViewport* vp = vik_window_viewport(vw);