buildbot found failures

config.h.cmake:
  define NOMINMAX, otherwise Windows system headers define min() and max() macros
sql/slave.cc:
  mi->report() has one more argument in MariaDB
storage/xtradb/buf/buf0flu.cc:
  xtradb fixes for windows, again

config.h.cmake

@@ -520,6 +520,11 @@
 #endif
 #define PSAPI_VERSION 1     /* for GetProcessMemoryInfo() */
 
+/* We don't want the min/max macros */
+#ifdef __WIN__
+#define NOMINMAX
+#endif
+
 /*
   MySQL features
 */

sql/slave.cc

@@ -1785,7 +1785,7 @@ when it try to get the value of TIME_ZONE global variable from master.";
       if (is_network_error(mysql_errno(mysql)))
       {
       IF_DBUG(heartbeat_network_error: , )
-        mi->report(WARNING_LEVEL, mysql_errno(mysql),
+        mi->report(WARNING_LEVEL, mysql_errno(mysql), NULL,
                    "SET @master_heartbeat_period to master failed with error: %s",
                    mysql_error(mysql));
         mysql_free_result(mysql_store_result(mysql));

storage/xtradb/buf/buf0flu.cc

@@ -1365,9 +1365,6 @@ buf_flush_page_and_try_neighbors(
 
 	ut_a(buf_page_in_file(bpage)
 	     || (buf_page_get_state(bpage) == BUF_BLOCK_REMOVE_HASH
-#ifdef UNIV_DEBUG
-		 && !mutex_own(&buf_pool->LRU_list_mutex)
-#endif
 		 ));
 
 	if (buf_flush_ready_for_flush(bpage, flush_type)) {