Commit: 60cef1a6cb40182c5f87b2943b741ce155ef1e0d Author: Campbell Barton Date: Thu Jul 24 18:23:00 2014 +1000 Branches: soc-2014-viewport_context https://developer.blender.org/rB60cef1a6cb40182c5f87b2943b741ce155ef1e0d
remove stdlib include from glew-mx & ensure bad args aren't passed into mxSetContext, mxDestroyContext =================================================================== M intern/glew-mx/glew-mx.h =================================================================== diff --git a/intern/glew-mx/glew-mx.h b/intern/glew-mx/glew-mx.h index 2af7f22..5af9773 100644 --- a/intern/glew-mx/glew-mx.h +++ b/intern/glew-mx/glew-mx.h @@ -58,11 +58,10 @@ void mxDestroyContext(GLEWContext* ctx); #else -#include <stdlib.h> /* for NULL */ - -#define mxSetContext(ctx) -#define mxCreateContext() NULL -#define mxDestroyContext(ctx) +/* don't use NULL here (mightn't be defined)*/ +#define mxSetContext(ctx) ((void)ctx) +#define mxCreateContext() ((void *)0) +#define mxDestroyContext(ctx) ((void)ctx) #endif /* GLEW_MX */ _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
