diff mbox series

libbacktrace patch committed: Use WIN32_LEAN_AND_MEAN

Message ID CAOyqgcWiO4QkotmgLaykBKKDWCOqNfqM0tqyMU7zRt+O6T-zVw@mail.gmail.com
State Committed
Commit f8f5732534f05ebebc8b72b3e4eabc0c19a9d6cf
Headers
Series libbacktrace patch committed: Use WIN32_LEAN_AND_MEAN |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 fail Patch failed to apply
linaro-tcwg-bot/tcwg_gcc_build--master-arm fail Patch failed to apply

Commit Message

Ian Lance Taylor Nov. 29, 2024, 9:20 p.m. UTC 
  The libbacktrace code accidentally use WIN32_MEAN_AND_LEAN when it
should have use WIN32_LEAN_AND_MEAN.  This was pointed out by awmorgan
on GitHub.  I've committed this patch to fix it.

Ian


            * fileline.c: Use WIN32_LEAN_AND_MEAN, not WIN32_MEAN_AND_LEAN.
            * pecoff.c: Likewise.
f8f5732534f05ebebc8b72b3e4eabc0c19a9d6cf
diff mbox series

Patch

diff --git a/libbacktrace/fileline.c b/libbacktrace/fileline.c
index 68e80c6d274..50a1e830c23 100644
--- a/libbacktrace/fileline.c
+++ b/libbacktrace/fileline.c
@@ -48,8 +48,8 @@  POSSIBILITY OF SUCH DAMAGE.  */
 #endif
 
 #ifdef HAVE_WINDOWS_H
-#ifndef WIN32_MEAN_AND_LEAN
-#define WIN32_MEAN_AND_LEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
 #endif
 
 #ifndef NOMINMAX
diff --git a/libbacktrace/pecoff.c b/libbacktrace/pecoff.c
index 15a73ff0b2a..b96ec27af42 100644
--- a/libbacktrace/pecoff.c
+++ b/libbacktrace/pecoff.c
@@ -40,8 +40,8 @@  POSSIBILITY OF SUCH DAMAGE.  */
 #include "internal.h"
 
 #ifdef HAVE_WINDOWS_H
-#ifndef WIN32_MEAN_AND_LEAN
-#define WIN32_MEAN_AND_LEAN
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
 #endif
 
 #ifndef NOMINMAX