1
0
Fork 0

Darwin fixes

This commit is contained in:
Frank Celler 2016-01-03 12:45:39 +01:00
parent c20cf66e93
commit b44c7ab64c
2 changed files with 11 additions and 1 deletions

View File

@ -35,7 +35,15 @@ cat configure.ac \
mv configure.ac.tmp configure.ac
./configure --enable-maintainer-mode CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib
if [ `uname` == "Darwin" ]; then
./configure \
--enable-maintainer-mode \
CPPFLAGS="-I/usr/local/include -I/usr/local/opt/openssl/include" \
LDFLAGS=-L/usr/local/opt/openssl/lib
else
./configure --enable-maintainer-mode
fi
make built-sources
make add-maintainer
make add-automagic

View File

@ -69,9 +69,11 @@ namespace {
CRYPTO_THREADID_set_pointer(id, p);
}
#ifndef __APPLE__
template<> inline void setter (CRYPTO_THREADID* id, unsigned long val) {
CRYPTO_THREADID_set_numeric(id, val);
}
#endif
static void arango_threadid_func (CRYPTO_THREADID *id) {
auto self = TRI_CurrentThreadId();