Putting in Diederick Niehorster's patch from e-mail dated 1/23/12 at 6:48 AM to fix...

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

diff --git a/src/Common/freeglut_main.c b/src/Common/freeglut_main.c
index 8c59640..b1654a5 100644 (file)
--- a/src/Common/freeglut_main.c
+++ b/src/Common/freeglut_main.c
@@ -70,13 +70,6 @@ struct GXKeyList gxKeyList;
 #    define MIN(a,b) (((a)<(b)) ? (a) : (b))\r
 #endif\r
 \r
-#ifdef WM_TOUCH\r
-    typedef BOOL (WINAPI *pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int);\r
-    typedef BOOL (WINAPI *pCloseTouchInputHandle)(HTOUCHINPUT);\r
-       static pGetTouchInputInfo fghGetTouchInputInfo = (pGetTouchInputInfo)0xDEADBEEF;\r
-       static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;\r
-#endif\r
-\r
 extern void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height );\r
 extern void fgPlatformDisplayWindow ( SFG_Window *window );\r
 extern void fgPlatformSleepForEvents( long msec );\r

diff --git a/src/Common/freeglut_window.c b/src/Common/freeglut_window.c
index 1d409b3..8a44d1a 100644 (file)
--- a/src/Common/freeglut_window.c
+++ b/src/Common/freeglut_window.c
@@ -89,11 +89,6 @@
 #endif  /* TARGET_HOST_POSIX_X11 */\r
 \r
 \r
-#ifdef WM_TOUCH\r
-       typedef BOOL (WINAPI *pRegisterTouchWindow)(HWND,ULONG);\r
-   static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF;\r
-#endif\r
-\r
 /* pushing attribute/value pairs into an array */\r
 #define ATTRIB(a) attributes[where++]=(a)\r
 #define ATTRIB_VAL(a,v) {ATTRIB(a); ATTRIB(v);}\r

diff --git a/src/mswin/freeglut_main_mswin.c b/src/mswin/freeglut_main_mswin.c
index 96ec77b..ca1f878 100644 (file)
--- a/src/mswin/freeglut_main_mswin.c
+++ b/src/mswin/freeglut_main_mswin.c
@@ -35,6 +35,13 @@ extern void fgNewWGLCreateContext( SFG_Window* window );
 extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,\r
                                      unsigned char layer_type );\r
 \r
+#ifdef WM_TOUCH\r
+typedef BOOL (WINAPI *pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int);\r
+typedef BOOL (WINAPI *pCloseTouchInputHandle)(HTOUCHINPUT);\r
+static pGetTouchInputInfo fghGetTouchInputInfo = (pGetTouchInputInfo)0xDEADBEEF;\r
+static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;\r
+#endif\r
+\r
 \r
 \r
 void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )\r

diff --git a/src/mswin/freeglut_window_mswin.c b/src/mswin/freeglut_window_mswin.c
index fe93985..655820f 100644 (file)
--- a/src/mswin/freeglut_window_mswin.c
+++ b/src/mswin/freeglut_window_mswin.c
@@ -90,6 +90,11 @@ extern int fghIsLegacyContextRequested( void );
 extern void fghContextCreationError( void );\r
 extern int fghNumberOfAuxBuffersRequested( void );\r
 \r
+#ifdef WM_TOUCH\r
+typedef BOOL (WINAPI *pRegisterTouchWindow)(HWND,ULONG);\r
+static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF;\r
+#endif\r
+\r
 \r
 /*\r
  * Setup the pixel format for a Win32 window\r