Fixed C2275 compiler error in fg_spaceball_mswin.c
- Known to only affect Visual Studio 2010. Visual Studio 2013 and up may have relaxed the error. (cherry picked from commit6b8552edbd
) (cherry picked from commit6b8552edbd
) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1779 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
f812349a8f
commit
012736d296
@ -64,6 +64,7 @@ void fgPlatformInitializeSpaceball(void)
|
|||||||
}
|
}
|
||||||
hwnd = fgStructure.CurrentWindow->Window.Handle;
|
hwnd = fgStructure.CurrentWindow->Window.Handle;
|
||||||
|
|
||||||
|
{
|
||||||
BOOL ok;
|
BOOL ok;
|
||||||
UINT cbSize = sizeof(__fgSpaceball);
|
UINT cbSize = sizeof(__fgSpaceball);
|
||||||
__fgSpaceball.hwndTarget = hwnd;
|
__fgSpaceball.hwndTarget = hwnd;
|
||||||
@ -74,6 +75,7 @@ void fgPlatformInitializeSpaceball(void)
|
|||||||
sball_initialized = 0;
|
sball_initialized = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void fgPlatformSpaceballClose(void)
|
void fgPlatformSpaceballClose(void)
|
||||||
{
|
{
|
||||||
@ -138,7 +140,7 @@ void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
|
|||||||
res = GetRawInputDeviceInfo(pRawInput->header.hDevice, RIDI_DEVICEINFO, &sRidDeviceInfo, &size);
|
res = GetRawInputDeviceInfo(pRawInput->header.hDevice, RIDI_DEVICEINFO, &sRidDeviceInfo, &size);
|
||||||
if (res == -1)
|
if (res == -1)
|
||||||
return;
|
return;
|
||||||
|
{
|
||||||
SFG_Window* window = fgWindowByHandle(hwnd);
|
SFG_Window* window = fgWindowByHandle(hwnd);
|
||||||
if ((window == NULL))
|
if ((window == NULL))
|
||||||
return;
|
return;
|
||||||
@ -192,5 +194,6 @@ void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
Reference in New Issue
Block a user