Cleanup: remove private babeltrace.h

[babeltrace.git] / src / plugins / ctf / fs-src / query.c

diff --git a/src/plugins/ctf/fs-src/query.c b/src/plugins/ctf/fs-src/query.c
index 3fa28b86e8eceb5a1346d879d9cff0f9b8034637..b83a4353cd6e9bc1012fd0c35b77c9cff05ac175 100644 (file)
--- a/src/plugins/ctf/fs-src/query.c
+++ b/src/plugins/ctf/fs-src/query.c
@@ -30,7 +30,7 @@
 #include "metadata.h"
 #include "../common/metadata/decoder.h"
 #include "common/common.h"
-#include "common/babeltrace.h"
+#include "common/macros.h"
 #include <babeltrace2/babeltrace.h>
 #include "fs.h"
 
@@ -427,15 +427,15 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
                }
 
                if (group_range.set) {
-                       trace_range.begin_ns = min(trace_range.begin_ns,
+                       trace_range.begin_ns = MIN(trace_range.begin_ns,
                                        group_range.begin_ns);
-                       trace_range.end_ns = max(trace_range.end_ns,
+                       trace_range.end_ns = MAX(trace_range.end_ns,
                                        group_range.end_ns);
                        trace_range.set = true;
 
-                       trace_intersection.begin_ns = max(trace_intersection.begin_ns,
+                       trace_intersection.begin_ns = MAX(trace_intersection.begin_ns,
                                        group_range.begin_ns);
-                       trace_intersection.end_ns = min(trace_intersection.end_ns,
+                       trace_intersection.end_ns = MIN(trace_intersection.end_ns,
                                        group_range.end_ns);
                        trace_intersection.set = true;
                }