Adding a multitouch patch from Eero Pajarre per e-mail dated 6/8/2011 1:14 AM

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@925 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index 81ce955..5d18440 100644 (file)
--- a/src/freeglut_main.c
+++ b/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/src/freeglut_window.c b/src/freeglut_window.c
index 7d50a9d..f3c509a 100644 (file)
--- a/src/freeglut_window.c
+++ b/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