Mesa (gallium-0.2): glut: Minor cleanups.

[Jose Fonseca]

Module: Mesa
Branch: gallium-0.2
Commit: f5fad95455bb3f9bd731451ea9811e3d0cc51660
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5fad95455bb3f9bd731451ea9811e3d0cc51660

Author: José Fonseca <jfons...@vmware.com>
Date:   Mon Jan 26 10:44:34 2009 +0000

glut: Minor cleanups.

---

 src/glut/glx/glut_event.c    |    2 --
 src/glut/glx/glut_input.c    |    2 ++
 src/glut/glx/win32_winproc.c |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c
index cf34e05..d6d9638 100644
--- 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 a76ff9a..7d2eda0 100644
--- 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 e1fc785..4a9dc37 100644
--- 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;

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit