summaryrefslogtreecommitdiff
path: root/storage/maria/unittest
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2011-11-26 23:08:46 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2011-11-26 23:08:46 +0100
commit7e55deea9bdf59c165905f7e55c2bee8a2013515 (patch)
treec6f9ce58343dd2087e7e97c48c136a2f269aa12c /storage/maria/unittest
parent64e308e28d2b0fb4cd005e23189e3639912bcd60 (diff)
downloadmariadb-git-7e55deea9bdf59c165905f7e55c2bee8a2013515.tar.gz
Fix MariaDB wasnings on Windows (rmdir not defined unless direct.h is included)
Diffstat (limited to 'storage/maria/unittest')
-rw-r--r--storage/maria/unittest/ma_maria_log_cleanup.c3
-rw-r--r--storage/maria/unittest/test_file.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/storage/maria/unittest/ma_maria_log_cleanup.c b/storage/maria/unittest/ma_maria_log_cleanup.c
index 5e84acf41af..60e4fdb02fd 100644
--- a/storage/maria/unittest/ma_maria_log_cleanup.c
+++ b/storage/maria/unittest/ma_maria_log_cleanup.c
@@ -15,6 +15,9 @@
#include "../maria_def.h"
#include <my_dir.h>
+#ifdef _WIN32
+#include <direct.h> /* rmdir */
+#endif
my_bool maria_log_remove(const char *testdir)
{
diff --git a/storage/maria/unittest/test_file.h b/storage/maria/unittest/test_file.h
index 0a1ccf4ab54..5b33f0e4f6c 100644
--- a/storage/maria/unittest/test_file.h
+++ b/storage/maria/unittest/test_file.h
@@ -15,7 +15,9 @@
#include <m_string.h>
#include "../ma_pagecache.h"
-
+#ifdef _WIN32
+#include <direct.h>
+#endif
/*
File content descriptor
*/