diff --git a/include/ma_global.h b/include/ma_global.h
index e8ca7df3..c6a08db6 100644
--- a/include/ma_global.h
+++ b/include/ma_global.h
@@ -26,6 +26,7 @@
 #include <windows.h>
 #include <stdlib.h>
 #define strcasecmp _stricmp
+#define strtok_r strtok_s
 #define sleep(x) Sleep(1000*(x))
 #ifdef _MSC_VER
 #define inline __inline
diff --git a/libmariadb/mariadb_rpl.c b/libmariadb/mariadb_rpl.c
index bf4914df..e54f226c 100644
--- a/libmariadb/mariadb_rpl.c
+++ b/libmariadb/mariadb_rpl.c
@@ -28,6 +28,10 @@
 #include <zlib.h>
 #include <mariadb_rpl.h>
 
+#ifdef WIN32
+#define alloca _alloca
+#endif
+
 static int rpl_alloc_string(MARIADB_RPL_EVENT *event,
                             MARIADB_STRING *s,
                             unsigned char *buffer,
@@ -120,7 +124,7 @@ static int ma_set_rpl_filename(MARIADB_RPL *rpl, const unsigned char *filename,
   if (!(rpl->filename= (char *)malloc(len)))
     return 1;
   memcpy(rpl->filename, filename, len);
-  rpl->filename_length= len;
+  rpl->filename_length= (uint32_t)len;
   return 0;
 }