X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c589ad076cb531a3ef7808aaedadc03c8286942..79144b8a47e93d03d136fd39cd730060930dec77:/src/msw/joystick.cpp

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 407e704130..58b7631915 100644
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -24,7 +24,7 @@
 #include "wx/window.h"
 #include "wx/msw/private.h"
 
-#ifndef __GNUWIN32__
+#if !defined( __GNUWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)
 #include <mmsystem.h>
 #endif
 
@@ -34,9 +34,11 @@ typedef UINT MMRESULT;
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include <wx/msw/gnuwin32/extra.h>
 #endif
 #endif
+#endif
 
 // Why doesn't BC++ have joyGetPosEx?
 #if !defined(__WIN32__) || defined(__BORLANDC__) || defined(__TWIN32__)