diff options
author | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
commit | 53116910b10e3b8a05f42970eff311c21808699f (patch) | |
tree | 6831e50a56a02fed324f8cb119e05d837e00d7cf /src/glut/glx/glut_input.c | |
parent | 7e104f9cde94279a902b408e8d1cf21779b393a8 (diff) | |
parent | 0ccbc3c905f0594a35d72887a1f115e148aaa596 (diff) |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
configure.ac
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_render.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) |