From ba4088e1f22ce8a097df4a870d5aae4187f9af19 Mon Sep 17 00:00:00 2001 From: rkrolib Date: Tue, 30 Dec 2003 11:43:24 +0000 Subject: [PATCH] Changed several #ifdef's to proper #if's. Eeek. Oook. git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@436 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/freeglut_joystick.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/freeglut/freeglut/src/freeglut_joystick.c b/freeglut/freeglut/src/freeglut_joystick.c index 8f7b5ee..ff8738a 100644 --- a/freeglut/freeglut/src/freeglut_joystick.c +++ b/freeglut/freeglut/src/freeglut_joystick.c @@ -48,7 +48,7 @@ /* * PWO: I don't like it at all. It's a mess. Could it be cleared? */ -#ifdef TARGET_HOST_WIN32 +#if TARGET_HOST_WIN32 # include # if defined( __CYGWIN32__ ) || defined( __CYGWIN__ ) # define NEAR /* */ @@ -103,7 +103,7 @@ # endif #endif -#ifdef TARGET_HOST_WIN32 +#if TARGET_HOST_WIN32 # define _JS_MAX_AXES 6 #else # ifdef __FreeBSD__ @@ -123,7 +123,7 @@ struct tagSFG_Joystick int id; #endif -#ifdef TARGET_HOST_WIN32 +#if TARGET_HOST_WIN32 JOYINFOEX js; UINT js_id; #else @@ -160,7 +160,7 @@ static SFG_Joystick* fgJoystick = NULL; */ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) { -#ifdef TARGET_HOST_WIN32 +#if TARGET_HOST_WIN32 MMRESULT status; #else int status; @@ -180,7 +180,7 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) return; } -#ifdef TARGET_HOST_WIN32 +#if TARGET_HOST_WIN32 status = joyGetPosEx( joy->js_id, &joy->js ); if( status != JOYERR_NOERROR ) @@ -350,7 +350,7 @@ static void fghJoystickRead( SFG_Joystick* joy, int* buttons, float* axes ) */ static void fghJoystickOpen( SFG_Joystick* joy ) { -#ifdef TARGET_HOST_WIN32 +#if TARGET_HOST_WIN32 JOYCAPS jsCaps; int i; @@ -538,7 +538,7 @@ void fgJoystickInit( int ident ) fgJoystick = ( SFG_Joystick * )calloc( sizeof( SFG_Joystick ), 1 ); -#ifdef TARGET_HOST_WIN32 +#if TARGET_HOST_WIN32 switch( ident ) { case 0: @@ -578,7 +578,7 @@ void fgJoystickClose( void ) if( !fgJoystick ) fgError( "illegal attempt to deinitialize joystick device" ); -#ifndef TARGET_HOST_WIN32 +#if !TARGET_HOST_WIN32 if( ! fgJoystick->error ) close( fgJoystick->fd ); #endif