Merge branch 'merge-tokudb-5.6' into 10.1
This commit is contained in:
commit
da1fbcb665
@ -60,7 +60,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
|
|||||||
#if defined(HAVE_SYS_SYSCALL_H)
|
#if defined(HAVE_SYS_SYSCALL_H)
|
||||||
# include <sys/syscall.h>
|
# include <sys/syscall.h>
|
||||||
#endif
|
#endif
|
||||||
#if defined(HAVE_SYS_SYSCTL_H)
|
#if defined(HAVE_SYS_SYSCTL_H) && !defined(_SC_PHYS_PAGES)
|
||||||
# include <sys/sysctl.h>
|
# include <sys/sysctl.h>
|
||||||
#endif
|
#endif
|
||||||
#if defined(HAVE_PTHREAD_H)
|
#if defined(HAVE_PTHREAD_H)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user