From f979d866eab033d40259c95ac8ee37d042ee618a Mon Sep 17 00:00:00 2001 From: fayjf Date: Fri, 10 Jun 2011 03:50:27 +0000 Subject: [PATCH] Adding a multitouch patch from Eero Pajarre per e-mail dated 6/8/2011 1:14 AM git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@925 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/freeglut_main.c | 4 ++-- freeglut/freeglut/src/freeglut_window.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/freeglut/freeglut/src/freeglut_main.c b/freeglut/freeglut/src/freeglut_main.c index 81ce955..5d18440 100644 --- a/freeglut/freeglut/src/freeglut_main.c +++ b/freeglut/freeglut/src/freeglut_main.c @@ -71,8 +71,8 @@ struct GXKeyList gxKeyList; #endif #ifdef WM_TOUCH - typedef BOOL (*pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int); - typedef BOOL (*pCloseTouchInputHandle)(HTOUCHINPUT); + typedef BOOL (WINAPI *pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int); + typedef BOOL (WINAPI *pCloseTouchInputHandle)(HTOUCHINPUT); static pGetTouchInputInfo fghGetTouchInputInfo = (pGetTouchInputInfo)0xDEADBEEF; static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF; #endif diff --git a/freeglut/freeglut/src/freeglut_window.c b/freeglut/freeglut/src/freeglut_window.c index 7d50a9d..f3c509a 100644 --- a/freeglut/freeglut/src/freeglut_window.c +++ b/freeglut/freeglut/src/freeglut_window.c @@ -142,7 +142,7 @@ typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShar #endif /* TARGET_HOST_MS_WINDOWS */ #ifdef WM_TOUCH - typedef BOOL (*pRegisterTouchWindow)(HWND,ULONG); + typedef BOOL (WINAPI *pRegisterTouchWindow)(HWND,ULONG); static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF; #endif