From b192a24c92bdd1620020825beaa346a3f61dc5ae Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Sat, 26 May 2001 21:11:10 +0000
Subject: [PATCH] Fix cvs conflict.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mac/carbon/joystick.cpp | 2 ++
 src/mac/joystick.cpp        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 49b1e38e94..2aecad336d 100644
--- 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
diff --git a/src/mac/joystick.cpp b/src/mac/joystick.cpp
index 49b1e38e94..2aecad336d 100644
--- 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