diff options
| author | CoprDistGit <infra@openeuler.org> | 2024-08-06 02:26:06 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2024-08-06 02:26:06 +0000 |
| commit | 5957157a0edfe9f07583bdb7530b172da2d7adfd (patch) | |
| tree | 3bbe9ee8b02c4b84782d71167ed57549c008ce92 /0021-ocaml-Use-Caml_state_opt-in-preference-to-caml_state.patch | |
| parent | 568b42b6ea0df8c498b6d8583c24caf101a47dd8 (diff) | |
automatic import of libguestfsopeneuler24.03_LTS
Diffstat (limited to '0021-ocaml-Use-Caml_state_opt-in-preference-to-caml_state.patch')
| -rw-r--r-- | 0021-ocaml-Use-Caml_state_opt-in-preference-to-caml_state.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/0021-ocaml-Use-Caml_state_opt-in-preference-to-caml_state.patch b/0021-ocaml-Use-Caml_state_opt-in-preference-to-caml_state.patch new file mode 100644 index 0000000..c0c7648 --- /dev/null +++ b/0021-ocaml-Use-Caml_state_opt-in-preference-to-caml_state.patch @@ -0,0 +1,25 @@ +From d4fabae17001702894526084bf0ab516de3599d5 Mon Sep 17 00:00:00 2001 +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 |