Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-17 08:30:06 +02:00
Code Issues Releases Wiki Activity

Fix warning about redefinition of a macro

Browse Source
This commit is contained in:
Paul Licameli 2018-11-12 23:40:31 -05:00
parent 6d679a65e6
commit 7c25e555ac
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/import/ImportMP3.cpp
View File

@ -77,6 +77,12 @@ void GetMP3ImportPlugin(ImportPluginList &importPluginList,
#include <wx/timer.h> #include <wx/timer.h>
#include <wx/intl.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" { extern "C" {
#include "mad.h" #include "mad.h"
@ -85,8 +91,6 @@ extern "C" {
#endif #endif
} }
#include "../WaveTrack.h"
#define INPUT_BUFFER_SIZE 65535 #define INPUT_BUFFER_SIZE 65535
#define PROGRESS_SCALING_FACTOR 100000 #define PROGRESS_SCALING_FACTOR 100000