Merge branch 'master' of git+ssh://keithw@git.freedesktop.org/git/mesa/mesa into vbo-0.2

Conflicts:

	src/mesa/array_cache/sources
	src/mesa/drivers/dri/i965/brw_context.c
	src/mesa/drivers/dri/i965/brw_draw.c
	src/mesa/drivers/dri/i965/brw_fallback.c
	src/mesa/drivers/dri/i965/brw_vs_emit.c
	src/mesa/drivers/dri/i965/brw_vs_tnl.c
	src/mesa/drivers/dri/mach64/mach64_context.c
	src/mesa/main/extensions.c
	src/mesa/main/getstring.c
	src/mesa/tnl/sources
	src/mesa/tnl/t_save_api.c
	src/mesa/tnl/t_save_playback.c
	src/mesa/tnl/t_vtx_api.c
	src/mesa/tnl/t_vtx_exec.c
	src/mesa/vbo/vbo_attrib.h
	src/mesa/vbo/vbo_exec_api.c
	src/mesa/vbo/vbo_save_api.c
	src/mesa/vbo/vbo_save_draw.c

1 files changed, 2 insertions, 3 deletions

diff --git a/src/glut/fbdev/callback.c b/src/glut/fbdev/callback.c
index 37373672d3..8c039f530b 100644
--- a/src/glut/fbdev/callback.c
+++ b/src/glut/fbdev/callback.c
@@ -24,6 +24,8 @@
  * Written by Sean D'Epagnier (c) 2006
  */
 
+#include <stdlib.h>
+
 #include <GL/glut.h>
 
 #include "internal.h"
@@ -72,19 +74,16 @@ void glutKeyboardUpFunc(void (*func)(unsigned char key, int x, int y))
 
 void glutMouseFunc(void (*func)(int button, int state, int x, int y))
 {
-   MouseEnabled = 1;
    MouseFunc = func;
 }
 
 void glutMotionFunc(void (*func)(int x, int y))
 {
-   MouseEnabled = 1;
    MotionFunc = func;
 }
 
 void glutPassiveMotionFunc(void (*func)(int x, int y))
 {
-   MouseEnabled = 1;
    PassiveMotionFunc = func;
 }