From 48607d9d15e0bff2c2cfbdc56e89e4bbc724dede Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 17 Mar 2026 16:05:45 +0000
Subject: [PATCH] m4/guestfs-ocaml.m4: Check for caml_unix_error

In OCaml 5.0, unix_error was renamed caml_unix_error.

If it's not available, define as unix_error, the old symbol name.
---
 common                     |  2 +-
 lib/guestfs-internal-all.h |  5 +++++
 m4/guestfs-ocaml.m4        | 16 ++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/common b/common
index c8e64b3ff..30d3e9213 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit c8e64b3ff0870871905b0ece60aebf512777948a
+Subproject commit 30d3e921307ddf687fc6666aca99354a8daee27e
diff --git a/lib/guestfs-internal-all.h b/lib/guestfs-internal-all.h
index e1ac29a78..df0b04a0b 100644
--- a/lib/guestfs-internal-all.h
+++ b/lib/guestfs-internal-all.h
@@ -164,4 +164,9 @@ extern int accept4 (int sockfd, struct sockaddr *__restrict__ addr,
 extern int pipe2 (int pipefd[2], int flags);
 #endif
 
+#ifndef HAVE_CAML_UNIX_ERROR
+/* For backwards compatibility with OCaml < 5.0 */
+#define caml_unix_error unix_error
+#endif
+
 #endif /* GUESTFS_INTERNAL_ALL_H_ */
diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
index 10d443408..200d27f3a 100644
--- a/m4/guestfs-ocaml.m4
+++ b/m4/guestfs-ocaml.m4
@@ -191,3 +191,19 @@ if test "x$INSTALL_OCAMLLIB" = "x"; then
 	INSTALL_OCAMLLIB=$OCAMLLIB
 fi
 AC_SUBST([INSTALL_OCAMLLIB])
+
+dnl Check if OCaml has caml_unix_error (added 2022, OCaml 5.0).
+AC_MSG_CHECKING([for caml_unix_error])
+cat >conftest.c <<'EOF'
+#include <caml/mlvalues.h>
+#include <caml/unixsupport.h>
+int main () { char *p = (void *) caml_unix_error; return 0; }
+EOF
+AS_IF([$OCAMLC conftest.c >&AS_MESSAGE_LOG_FD 2>&1],[
+    AC_MSG_RESULT([yes])
+    AC_DEFINE([HAVE_CAML_UNIX_ERROR],[1],
+              [caml_unix_error found at compile time.])
+],[
+    AC_MSG_RESULT([no])
+])
+rm -f conftest.c conftest.o