From cbc1809237a37478312e64435f961aff674153de Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Fri, 13 Mar 2026 13:37:37 -0400 Subject: [PATCH] try to work for lwt 5 and lwt 6 --- src/client/lwt/dune | 12 ++++++++++++ src/client/lwt/notifier_lwt.ml | 2 +- src/client/lwt/types_.ml.5 | 2 ++ src/client/lwt/types_.ml.6 | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/client/lwt/types_.ml.5 create mode 100644 src/client/lwt/types_.ml.6 diff --git a/src/client/lwt/dune b/src/client/lwt/dune index e5e2bdfb..0106cc8e 100644 --- a/src/client/lwt/dune +++ b/src/client/lwt/dune @@ -25,3 +25,15 @@ mtime.clock.os lwt.unix) (synopsis "Lwt-specific helpers for opentelemetry-client")) + +(rule + (enabled_if + (>= %{version:lwt} 6.0)) + (action + (copy types_.ml.6 types_.ml))) + +(rule + (enabled_if + (< %{version:lwt} 6.0)) + (action + (copy types_.ml.5 types_.ml))) diff --git a/src/client/lwt/notifier_lwt.ml b/src/client/lwt/notifier_lwt.ml index 722ea3d1..c9a241aa 100644 --- a/src/client/lwt/notifier_lwt.ml +++ b/src/client/lwt/notifier_lwt.ml @@ -5,7 +5,7 @@ module IO = Io_lwt type t = { notified: bool Atomic.t; cond: unit Lwt_condition.t; - notification: Lwt_unix.notification; + notification: Types_.notification; lwt_tid: int; (** thread ID where lwt runs *) deleted: bool Atomic.t; } diff --git a/src/client/lwt/types_.ml.5 b/src/client/lwt/types_.ml.5 new file mode 100644 index 00000000..c34ffc81 --- /dev/null +++ b/src/client/lwt/types_.ml.5 @@ -0,0 +1,2 @@ + +type notification = int diff --git a/src/client/lwt/types_.ml.6 b/src/client/lwt/types_.ml.6 new file mode 100644 index 00000000..bff82f73 --- /dev/null +++ b/src/client/lwt/types_.ml.6 @@ -0,0 +1,2 @@ + +type notification = Lwt_unix.notification