X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Fquery.c;h=3a58e1ff23f4b9a311e2b8899133d1be4ac7ff71;hb=350ad6c1c5f45a4e90c33e3c1354125c209bbf02;hp=3fa28b86e8eceb5a1346d879d9cff0f9b8034637;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-src/query.c b/src/plugins/ctf/fs-src/query.c
index 3fa28b86..3a58e1ff 100644
--- a/src/plugins/ctf/fs-src/query.c
+++ b/src/plugins/ctf/fs-src/query.c
@@ -30,11 +30,11 @@
 #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"
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-QUERY-SRC"
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/QUERY"
 #include "logging.h"
 
 #define METADATA_TEXT_SIG	"/* CTF 1.8"
@@ -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;
 		}