diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-01-26 10:44:34 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-01-26 20:28:04 +0000 |
| commit | f5fad95455bb3f9bd731451ea9811e3d0cc51660 (patch) | |
| tree | d9422aed407e485e096908df2c1aa43d8d951dbf /src/glut | |
| parent | f25421a59b002a8b679df86c0a072cf853e94f10 (diff) | |
glut: Minor cleanups.
Diffstat (limited to 'src/glut')
| -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 cf34e05ca9..d6d963896a 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 a76ff9a435..7d2eda00f7 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 e1fc785ebb..4a9dc3781c 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; |