diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-12-11 15:43:41 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-12-11 15:43:41 +0300 |
| commit | 79dd77e6aebc861b82e4895941224bbbad441650 (patch) | |
| tree | 8c22b54de7964a89358415b5380c2bc734f162a1 /storage/rocksdb/rdb_io_watchdog.cc | |
| parent | b7cd18289639b30fafc7f623c1187e442608727c (diff) | |
| parent | 8f581e8bf1d400be08995b1cf8c11e3b0f7ae283 (diff) | |
| download | mariadb-git-79dd77e6aebc861b82e4895941224bbbad441650.tar.gz | |
System Versioning 1.0 pre3
Merge branch '10.3' into trunk
Diffstat (limited to 'storage/rocksdb/rdb_io_watchdog.cc')
| -rw-r--r-- | storage/rocksdb/rdb_io_watchdog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/rocksdb/rdb_io_watchdog.cc b/storage/rocksdb/rdb_io_watchdog.cc index b41e9248d52..039b0d7baf1 100644 --- a/storage/rocksdb/rdb_io_watchdog.cc +++ b/storage/rocksdb/rdb_io_watchdog.cc @@ -22,7 +22,7 @@ #include <vector> /* Rdb_io_watchdog doesn't work on Windows [yet] */ -#if !defined(_WIN32) && !defined(__APPLE__) +#ifdef HAVE_TIMER_DELETE namespace myrocks { |