From e8a93ae38ea6a2efabd6b6bb148ff7291216ff2b Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Thu, 27 Feb 2003 04:28:18 +0000
Subject: [PATCH] fix joystick support under MinGW

---
 ChangeLog      | 4 ++++
 main/kconfig.c | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d496f68..a249abb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-26  Micah J. Lieske  <MicahJon@compuserve.com>
+
+	* main/kconfig.c: fix joystick support under MinGW
+
 2003-02-26  Bradley Bell  <btb@icculus.org>
 
 	* main/playsave.c: fix swapping glitch
diff --git a/main/kconfig.c b/main/kconfig.c
index 7d976946..2fa8f9b9 100644
--- a/main/kconfig.c
+++ b/main/kconfig.c
@@ -1,4 +1,4 @@
-/* $Id: kconfig.c,v 1.15 2002-09-19 05:43:15 btb Exp $ */
+/* $Id: kconfig.c,v 1.16 2003-02-27 04:28:18 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -346,7 +346,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
  */
 
 #ifdef RCS
-static char rcsid[] = "$Id: kconfig.c,v 1.15 2002-09-19 05:43:15 btb Exp $";
+static char rcsid[] = "$Id: kconfig.c,v 1.16 2003-02-27 04:28:18 btb Exp $";
 #endif
 
 #ifdef WINDOWS
@@ -3066,7 +3066,7 @@ void controls_read_all()
 		channel_masks = joystick_read_raw_axis( JOY_ALL_AXIS, raw_joy_axis );
 		
 		for (i=0; i<6; i++ )	{
-#ifndef __unix__
+#ifndef SDL_INPUT
 			if (channel_masks&(1<<i))	{
 #endif
 				int joy_null_value = 10;
@@ -3087,7 +3087,7 @@ void controls_read_all()
 					  raw_joy_axis[i] = 0;
 					joy_axis[i]	= (raw_joy_axis[i]*FrameTime)/128;	
 				}
-#ifndef __unix__
+#ifndef SDL_INPUT
 			} else {
 				joy_axis[i] = 0;
 			}
-- 
2.39.2