Merge branch 'merge-tokudb-5.6' into 10.1

da1fbcb6 · Oleksandr Byelkin · 23c6fb3e · 15db581e · da1fbcb6
Commit da1fbcb6 authored Apr 30, 2020 by Oleksandr Byelkin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/tokudb/PerconaFT/portability/portability.cc storage/tokudb/PerconaFT/portability/portability.cc +1 -1

No files found.
--- a/storage/tokudb/PerconaFT/portability/portability.cc
+++ b/storage/tokudb/PerconaFT/portability/portability.cc
@@ -60,7 +60,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
 #if defined(HAVE_SYS_SYSCALL_H)
 # include <sys/syscall.h>
 #endif
-#if defined(HAVE_SYS_SYSCTL_H)
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(_SC_PHYS_PAGES)
 # include <sys/sysctl.h>
 #endif
 #if defined(HAVE_PTHREAD_H)