From 7c25e555ac3a86326803d90034aefc619ba763f5 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Mon, 12 Nov 2018 23:40:31 -0500
Subject: [PATCH] Fix warning about redefinition of a macro

---
 src/import/ImportMP3.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/import/ImportMP3.cpp b/src/import/ImportMP3.cpp
index 1feb77fb9..87133abdc 100644
--- a/src/import/ImportMP3.cpp
+++ b/src/import/ImportMP3.cpp
@@ -77,6 +77,12 @@ void GetMP3ImportPlugin(ImportPluginList &importPluginList,
 #include <wx/timer.h>
 #include <wx/intl.h>
 
+#include "../WaveTrack.h"
+
+// PRL:  include these last,
+// and correct some preprocessor namespace pollution from wxWidgets that
+// caused a warning about duplicate definition
+#undef SIZEOF_LONG
 extern "C" {
 #include "mad.h"
 
@@ -85,8 +91,6 @@ extern "C" {
 #endif
 }
 
-#include "../WaveTrack.h"
-
 #define INPUT_BUFFER_SIZE 65535
 #define PROGRESS_SCALING_FACTOR 100000