From: Katerina Kubecova <katerina.kubecova@nic.cz>
Date: Thu, 6 Mar 2025 11:53:39 +0000 (+0100)
Subject: merging: There is conflict in usage of bird_thread_commit. The problem is in adding... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Ftry-to-merge;p=thirdparty%2Fbird.git

merging: There is conflict in usage of bird_thread_commit. The problem is in adding struct config *old parameter and new usage of bird_thread_commit in main.c. (in addition, this causes include conflict with conf.h)
---

diff --git a/lib/io-loop.h b/lib/io-loop.h
index 4f10d2d4f..c71820f6c 100644
--- a/lib/io-loop.h
+++ b/lib/io-loop.h
@@ -17,6 +17,7 @@ extern struct birdloop main_birdloop;
 #include "lib/event.h"
 #include "lib/timer.h"
 #include "lib/socket.h"
+//#include "conf/conf.h"
 
 /* Currently running birdloop */
 extern _Thread_local struct birdloop *this_birdloop;
@@ -108,7 +109,7 @@ struct thread_config {
   uint count;
 };
 
-void bird_thread_commit(struct thread_config *new);
+//void bird_thread_commit(struct thread_config *new, struct config *old);
 
 /* Minimalist main */
 void birdloop_minimalist_main(void) NORET;
diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c
index 87d5088cb..e4c634a5d 100644
--- a/sysdep/unix/io-loop.c
+++ b/sysdep/unix/io-loop.c
@@ -29,7 +29,6 @@
 
 #include "lib/io-loop.h"
 #include "sysdep/unix/io-loop.h"
-#include "conf/conf.h"
 
 #define THREAD_STACK_SIZE	65536	/* To be lowered in near future */
 
@@ -623,6 +622,8 @@ struct thread_group_private {
   const struct thread_group_config *cf;
 };
 
+static void bird_thread_start_event(void *_data);
+
 struct birdloop_pickup_group pickup_groups[2] = {
   {
     /* all zeroes */