mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the build on OpenBSD (#488)

Browse source 
* rocksdb fails without timer_delete() - only use it when it exists
This commit is contained in:
David Carlier 2017-11-13 21:25:30 +00:00 • committed by Sergei Golubchik
parent 14c2a9a52e
commit f86413ecc1
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
storage/rocksdb/CMakeLists.txt
View file

@ -9,6 +9,11 @@ IF (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/Makefile")
SKIP_ROCKSDB_PLUGIN("Missing Makefile in rocksdb directory. Try \"git submodule update\".")
ENDIF()
CHECK_LIBRARY_EXISTS(rt timer_delete "" HAVE_TIMER_DELETE)
IF (HAVE_TIMER_DELETE)
ADD_DEFINITIONS(-DHAVE_TIMER_DELETE)
ENDIF(HAVE_TIMER_DELETE)
CHECK_FUNCTION_EXISTS(sched_getcpu HAVE_SCHED_GETCPU)
IF(HAVE_SCHED_GETCPU)
ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU=1 -DROCKSDB_SCHED_GETCPU_PRESENT)

2
storage/rocksdb/rdb_io_watchdog.cc
View file

@ -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 {

2
storage/rocksdb/rdb_io_watchdog.h
View file

@ -35,7 +35,7 @@
namespace myrocks {
// Rdb_io_watchdog does not support Windows ATM.
#if !defined(_WIN32) && !defined(__APPLE__)
#ifdef HAVE_TIMER_DELETE
class Rdb_io_watchdog {
const int RDB_IO_WRITE_BUFFER_SIZE = 4096;