diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-01-26 10:44:34 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2011-07-11 20:05:24 +0100 |
| commit | d75e96774dcafe4387d3e8b4f8fb236bf6bc6d85 (patch) | |
| tree | b63c61d62b3a00b5f64a604ca7de8fda71bdbe04 | |
| parent | a3e23e09bf07103de0ea7bf0fb9fb89608cc6aa0 (diff) | |
| download | glut-d75e96774dcafe4387d3e8b4f8fb236bf6bc6d85.tar.gz | |
glut: Minor cleanups.
| -rw-r--r-- | src/glut/glx/glut_event.c | 2 | ||||
| -rw-r--r-- | src/glut/glx/glut_input.c | 2 | ||||
| -rw-r--r-- | 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; |