From b8dc96975ee22bbe64b3e2e04272770616aca454 Mon Sep 17 00:00:00 2001
From: Mike Beaton <mjsbeaton@gmail.com>
Date: Fri, 20 Sep 2024 22:34:20 +0100
Subject: [PATCH] ALT-TEST

---
 MdePkg/Include/Library/DebugLib.h       | 13 +++++++------
 MdePkg/Include/Library/PerformanceLib.h | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h
index e9f7b5b49e79..47aa1f6c87a5 100644
--- a/MdePkg/Include/Library/DebugLib.h
+++ b/MdePkg/Include/Library/DebugLib.h
@@ -534,12 +534,13 @@ UnitTestDebugAssert (
   are not included in a module.
 
 **/
-#define DEBUG_CODE_BEGIN()      \
-  do {                          \
-    BOOLEAN  __DebugCodeLocal;  \
-    __DebugCodeLocal = FALSE;   \
-    do {                        \
-      if (DebugCodeEnabled ()) {
+#define DEBUG_CODE_BEGIN()       \
+  do {                           \
+    BOOLEAN  __DebugCodeLocal;   \
+    __DebugCodeLocal = FALSE;    \
+    do {                         \
+      if (DebugCodeEnabled ()) { \
+        (VOID) __DebugCodeLocal
 
 /**
   The macro that marks the end of debug source code.
diff --git a/MdePkg/Include/Library/PerformanceLib.h b/MdePkg/Include/Library/PerformanceLib.h
index 57ba45eb7b58..f3462a5a2dc2 100644
--- a/MdePkg/Include/Library/PerformanceLib.h
+++ b/MdePkg/Include/Library/PerformanceLib.h
@@ -734,12 +734,13 @@ LogPerformanceMeasurement (
   Otherwise, the source lines between PERF_CODE_BEGIN() and PERF_CODE_END() are not included in a module.
 
 **/
-#define PERF_CODE_BEGIN()            \
-  do {                               \
-    BOOLEAN  __PerformanceCodeLocal; \
-    __PerformanceCodeLocal = FALSE;  \
-    do {                             \
-      if (PerformanceMeasurementEnabled ()) {
+#define PERF_CODE_BEGIN()                     \
+  do {                                        \
+    BOOLEAN  __PerformanceCodeLocal;          \
+    __PerformanceCodeLocal = FALSE;           \
+    do {                                      \
+      if (PerformanceMeasurementEnabled ()) { \
+        (VOID) __PerformanceCodeLocal
 
 /**
   Macro that marks the end of performance measurement source code.