From fc91880faf7968432710e439e77ef067759d16fc Mon Sep 17 00:00:00 2001
From: Matthias Melcher <github@matthiasm.com>
Date: Tue, 15 Apr 2025 14:47:24 +0200
Subject: Reactivating Mergeback functionality. (#1226)

Reactivated code.
Various fixes.
New documentation.
---
 fluid/io/Code_Writer.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'fluid/io/Code_Writer.h')

diff --git a/fluid/io/Code_Writer.h b/fluid/io/Code_Writer.h
index ca23ca0a2..c199197ec 100644
--- a/fluid/io/Code_Writer.h
+++ b/fluid/io/Code_Writer.h
@@ -17,6 +17,8 @@
 #ifndef FLUID_IO_CODE_WRITER_H
 #define FLUID_IO_CODE_WRITER_H
 
+#include "proj/mergeback.h"
+
 #include <FL/fl_attr.h>
 
 #include <stdarg.h>
@@ -114,7 +116,7 @@ public:
   int write_code(const char *cfile, const char *hfile, bool to_codeview=false);
   void write_public(int state); // writes pubic:/private: as needed
 
-  void tag(int type, unsigned short uid);
+  void tag(proj::Mergeback::Tag prev_type, proj::Mergeback::Tag next_type, unsigned short uid);
 
   static unsigned long block_crc(const void *data, int n=-1, unsigned long in_crc=0, bool *inout_line_start=nullptr);
 };
-- 
cgit v1.2.3