diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-10 16:44:02 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-10 16:44:02 -0700 |
| commit | 5340b6dff73a0a23531ce2a5f28fba8303adab6e (patch) | |
| tree | b141fc3648568dd8b941c966059e6ed32a8bd0ad /src/glut/glx/glut_input.c | |
| parent | 9fd26daec24f21dbe17afcb2e2ab272667ee9a69 (diff) | |
| parent | ee4c921b65fb76998711f3c40330505cbc49a0e0 (diff) | |
Merge commit 'origin/gallium-master-merge'
This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.
Conflicts:
progs/demos/Makefile
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
Diffstat (limited to 'src/glut/glx/glut_input.c')
| -rw-r--r-- | src/glut/glx/glut_input.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) |