From fb9738ff02ba73ca3e5bf1cd1606d55c4c351aa3 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Tue, 31 Jan 2023 11:22:10 -0500
Subject: [PATCH] MT#55283 fix def/undef pairing

Change-Id: I5d425b3860d969b6bb3aaf95d92d5ecc61dd0bca
---
 include/statistics.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/statistics.h b/include/statistics.h
index eb5017376..365113803 100644
--- a/include/statistics.h
+++ b/include/statistics.h
@@ -36,7 +36,9 @@ struct global_stats_gauge {
 #define FdA(x, n) FA(x, n)
 #include "gauge_stats_fields.inc"
 #undef F
+#undef Fd
 #undef FA
+#undef FdA
 };
 
 struct global_stats_gauge_min_max {
@@ -221,14 +223,15 @@ INLINE void stats_gauge_calc_avg_reset(struct global_stats_gauge_min_max *out,
 #define F(x) \
 	cur = atomic64_get(&rtpe_stats_gauge.x); \
 	Fc(x)
-#undef Fd
-#undef FdA
 #define Fd(x) \
 	cur = 0; \
 	Fc(x)
 #define FdA(x, n) for (int i = 0; i < n; i++) { Fd(x[i]) }
 #include "gauge_stats_fields.inc"
+#undef Fc
 #undef F
+#undef Fd
+#undef FdA
 }