Fix cvs conflict.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-26 21:11:10 +00:00 · 2001-05-26 21:11:10 +00:00 · b192a24c92
commit b192a24c92
parent 2301e28195
2 changed files with 4 additions and 0 deletions
--- a/src/mac/carbon/joystick.cpp
+++ b/src/mac/carbon/joystick.cpp
@ -13,6 +13,8 @@
 #pragma implementation "joystick.h"
 #endif

+#include <wx/setup.h>
+
 #include <wx/joystick.h>

 #if wxUSE_JOYSTICK
--- a/src/mac/joystick.cpp
+++ b/src/mac/joystick.cpp
@ -13,6 +13,8 @@
 #pragma implementation "joystick.h"
 #endif

+#include <wx/setup.h>
+
 #include <wx/joystick.h>

 #if wxUSE_JOYSTICK