X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_internal.h;h=c2fa064a2515fca305d0887d1fb274b4bf026822;hb=ce2e5aba172eb85cda2b4f047bdcf9f54d019fd7;hp=8182f362fca3461c1297620db1df17f28de89f03;hpb=352d4e747f296e49bf4ff00a99cef21525980c38;p=freeglut diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h index 8182f36..c2fa064 100644 --- a/src/freeglut_internal.h +++ b/src/freeglut_internal.h @@ -42,7 +42,7 @@ # define TARGET_HOST_UNIX_X11 0 # define TARGET_HOST_WIN32 0 # define TARGET_HOST_WINCE 1 -#elif defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) +#elif defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WATCOMC__) # define TARGET_HOST_UNIX_X11 0 # define TARGET_HOST_WIN32 1 # define TARGET_HOST_WINCE 0 @@ -73,7 +73,7 @@ LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID); #endif #endif -#if defined(_MSC_VER) +#if defined(_MSC_VER) || defined(__WATCOMC__) #define strdup _strdup #endif @@ -781,11 +781,6 @@ void fgInitialiseJoysticks( void ); void fgJoystickClose( void ); void fgJoystickPollWindow( SFG_Window* window ); -/* More joystick functions. Should these go into the API? */ -int glutJoystickGetNumAxes( int ident ); -int glutJoystickGetNumButtons( int ident ); -int glutJoystickNotWorking( int ident ); - /* InputDevice Initialisation and Closure */ int fgInputDeviceDetect( void ); void fgInitialiseInputDevices( void );