You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
995 B
26 lines
995 B
3 months ago
|
From ff62b8f758e16aab82960474c79a7fc10a0af3ed Mon Sep 17 00:00:00 2001
|
||
|
9 months ago
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||
|
|
Date: Tue, 27 Jun 2023 16:31:55 +0100
|
||
|
|
Subject: [PATCH] ocaml: Use Caml_state_opt in preference to caml_state
|
||
|
|
|
||
|
|
Link: https://discuss.ocaml.org/t/test-caml-state-and-conditionally-caml-acquire-runtime-system-good-or-bad/12489/7
|
||
|
|
Thanks: Guillaume Munch-Maccagnoni
|
||
|
|
(cherry picked from commit cade0b1aeb828d294a7c4e323f8131322d30fb73)
|
||
|
|
---
|
||
|
|
ocaml/guestfs-c.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/ocaml/guestfs-c.c b/ocaml/guestfs-c.c
|
||
|
|
index 67dc3547..8a8761e8 100644
|
||
|
|
--- a/ocaml/guestfs-c.c
|
||
|
|
+++ b/ocaml/guestfs-c.c
|
||
|
|
@@ -412,7 +412,7 @@ event_callback_wrapper (guestfs_h *g,
|
||
|
|
* https://discuss.ocaml.org/t/test-caml-state-and-conditionally-caml-acquire-runtime-system-good-or-bad/12489
|
||
|
|
*/
|
||
|
|
#if OCAML_VERSION_MAJOR >= 5
|
||
|
|
- bool acquired = caml_state != NULL;
|
||
|
|
+ bool acquired = Caml_state_opt != NULL;
|
||
|
|
#else
|
||
|
|
const bool acquired = false;
|
||
|
|
#endif
|