diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-10-17 19:03:42 -0700 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-10-17 19:09:42 -0700 |
| commit | 0072acd447dc6be652e63752e50215c3105322c8 (patch) | |
| tree | 847d1763b54772d336a04e606f8248291c3092b7 /src/glut | |
| parent | 543fb77ddece7e1806e8eaa0d65bb2a945ef9a75 (diff) | |
| parent | ca2b2ac131933b4171b519813df1aaa3a81621cd (diff) | |
Merge remote branch 'origin/master' into lp-setup-llvm
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup_coef.c
src/gallium/drivers/llvmpipe/lp_setup_coef.h
src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_setup_tri.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.h
Diffstat (limited to 'src/glut')
| -rw-r--r-- | src/glut/glx/glut_event.c | 4 | ||||
| -rw-r--r-- | src/glut/glx/glut_input.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c index 4cdb814d76..c450ee96b8 100644 --- a/src/glut/glx/glut_event.c +++ b/src/glut/glx/glut_event.c @@ -251,6 +251,8 @@ __glutRegisterEventParser(GLUTeventParser * parser) eventParserList = parser; } + +#if !defined(_WIN32) static void markWindowHidden(GLUTwindow * window) { @@ -272,8 +274,6 @@ markWindowHidden(GLUTwindow * window) } } -#if !defined(_WIN32) - static void purgeStaleWindow(Window win) { diff --git a/src/glut/glx/glut_input.c b/src/glut/glx/glut_input.c index 7d2eda00f7..53f9dc5e0f 100644 --- a/src/glut/glx/glut_input.c +++ b/src/glut/glx/glut_input.c @@ -292,10 +292,10 @@ __glutProcessDeviceEvents(XEvent * event) return 0; } +#if !defined(_WIN32) static GLUTeventParser eventParser = {__glutProcessDeviceEvents, NULL}; -#if !defined(_WIN32) static void addDeviceEventParser(void) { |