From 55ba79a2e079d98cdf09ecc104eb4c577432ed83 Mon Sep 17 00:00:00 2001
From: David Declerck <david.declerck@ocamlpro.com>
Date: Tue, 17 Sep 2024 15:32:03 +0200
Subject: [PATCH] Post-merge fixes

---
 cobc/pplex.l     | 1 +
 cobc/scanner.l   | 3 ++-
 libcob/ChangeLog | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cobc/pplex.l b/cobc/pplex.l
index 52c17fe1a..73c46128d 100644
--- a/cobc/pplex.l
+++ b/cobc/pplex.l
@@ -86,6 +86,7 @@ static int ppwrap (void) {
 #include <ctype.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <stdio.h>
 #include <string.h>
 #ifdef	HAVE_STRINGS_H
 #include <strings.h>
diff --git a/cobc/scanner.l b/cobc/scanner.l
index 2fedfef4f..00040867d 100644
--- a/cobc/scanner.l
+++ b/cobc/scanner.l
@@ -85,6 +85,7 @@ static int yywrap (void) {
 #include <ctype.h>
 #include <limits.h>
 
+#include <stdio.h>
 #include <string.h>
 #ifdef	HAVE_STRINGS_H
 #include <strings.h>
@@ -1391,7 +1392,7 @@ scan_ebcdic_char (int c)
 			  buff, "(1..256)");
 		return '?';
 	}
-        c--; // in ordinal, i.e. 1..256 -> 0..255
+        c--; /* in ordinal, i.e. 1..256 -> 0..255 */
 #ifdef COB_EBCDIC_MACHINE
 	return (cob_u8_t) c;
 #else
diff --git a/libcob/ChangeLog b/libcob/ChangeLog
index e0de3366e..64673ba1d 100644
--- a/libcob/ChangeLog
+++ b/libcob/ChangeLog
@@ -180,7 +180,7 @@
 
 2023-01-19  Simon Sobisch <simonsobisch@gnu.org>
 
-	* call.c (cob_put_s64_param, cob_put_u64_param): switched to common msgid
+	* call.c->cobcapi.c (cob_put_s64_param, cob_put_u64_param): switched to common msgid
 	* common.c (cob_sys_getopt_long_long): lower-case msgid
 
 2023-01-18  Simon Sobisch <simonsobisch@gnu.org>