glut: Minor cleanups.

diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c
index cf34e05ca9858dfc2b764b1bcbf3b572f2bfd569..d6d963896a6fff8143f914956e60f4f774eac377 100644 (file)
--- a/src/glut/glx/glut_event.c
+++ b/src/glut/glx/glut_event.c
@@ -1343,9 +1343,7 @@ processWindowWorkList(GLUTwindow * window)
   }
 }
 
-#ifndef _WIN32
 static  /* X11 implementations do not need this global. */
-#endif
 void
 __glutProcessWindowWorkLists(void)
 {

diff --git a/src/glut/glx/glut_input.c b/src/glut/glx/glut_input.c
index a76ff9a435ecc06fe6588dbbf9f367a8b0a7ae6a..7d2eda00f71c6e7dbed70b1fec7d8dfb3923d6d2 100644 (file)
--- a/src/glut/glx/glut_input.c
+++ b/src/glut/glx/glut_input.c
@@ -295,6 +295,7 @@ __glutProcessDeviceEvents(XEvent * event)
 static GLUTeventParser eventParser =
 {__glutProcessDeviceEvents, NULL};
 
+#if !defined(_WIN32)
 static void
 addDeviceEventParser(void)
 {
@@ -305,6 +306,7 @@ addDeviceEventParser(void)
   been_here = True;
   __glutRegisterEventParser(&eventParser);
 }
+#endif
 
 static int
 probeDevices(void)

diff --git a/src/glut/glx/win32_winproc.c b/src/glut/glx/win32_winproc.c
index e1fc785ebb7fff95053eb179cab5b12965031014..4a9dc3781c2ed4f4aa4962c21ecfa261c2ab8a37 100644 (file)
--- a/src/glut/glx/win32_winproc.c
+++ b/src/glut/glx/win32_winproc.c
@@ -20,10 +20,10 @@
 extern unsigned __glutMenuButton;
 extern GLUTidleCB __glutIdleFunc;
 extern GLUTtimer *__glutTimerList;
-extern GLUTmenuItem *__glutGetUniqueMenuItem(GLUTmenu * menu, int unique);
+extern GLUTmenuItem *__glutGetUniqueMenuItem(GLUTmenu * menu, UINT unique);
 static HMENU __glutHMenu;
 
-void
+static void
 updateWindowState(GLUTwindow *window, int visState)
 {
   GLUTwindow* child;