missing include for fluid

intern/smoke/intern/FLUID_3D_SOLVERS.cpp

@@ -21,7 +21,7 @@
 //////////////////////////////////////////////////////////////////////
 
 #include "FLUID_3D.h"
-
+#include <cstring>
 #define SOLVER_ACCURACY 1e-06
 
 void FLUID_3D::solvePressurePre(float* field, float* b, unsigned char* skip)

source/blender/python/intern/bpy_interface.c

@@ -808,7 +808,7 @@ float BPY_pydriver_eval (ChannelDriver *driver)
 int BPY_button_eval(bContext *C, char *expr, double *value)
 {
 	PyGILState_STATE gilstate;
-	PyObject *dict, *retval, *expr_conv;
+	PyObject *dict, *retval, *expr_conv= NULL;
 	int error_ret = 0;
 	
 	if (!value || !expr || expr[0]=='\0') return -1;