diff options
| author | Andrew Morrow <acm@mongodb.com> | 2017-06-04 12:29:19 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2017-06-05 11:28:38 -0400 |
| commit | 9785b9c4cda63c813abb2468e644eb84cc903f69 (patch) | |
| tree | f1740a84a887ef817a35ac888d1789218708dba6 | |
| parent | 2accdb583a33a32d1adbb99c4905bd53c20d3f7d (diff) | |
| download | mongo-9785b9c4cda63c813abb2468e644eb84cc903f69.tar.gz | |
SERVER-29443 Fix iOS and tvOS compiles
| -rw-r--r-- | src/mongo/util/concurrency/thread_name.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/util/processinfo_osx.cpp | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/mongo/util/concurrency/thread_name.cpp b/src/mongo/util/concurrency/thread_name.cpp index d2917fd5c02..2c2470a5ad5 100644 --- a/src/mongo/util/concurrency/thread_name.cpp +++ b/src/mongo/util/concurrency/thread_name.cpp @@ -37,7 +37,12 @@ #include <pthread.h> #endif #if defined(__APPLE__) +#include <TargetConditionals.h> +#if !TARGET_OS_TV && !TARGET_OS_IOS #include <sys/proc_info.h> +#else +#include <mach/thread_info.h> +#endif #endif #if defined(__linux__) #include <sys/syscall.h> diff --git a/src/mongo/util/processinfo_osx.cpp b/src/mongo/util/processinfo_osx.cpp index 6ba35c6336a..c82aa3f9411 100644 --- a/src/mongo/util/processinfo_osx.cpp +++ b/src/mongo/util/processinfo_osx.cpp @@ -38,7 +38,6 @@ #include <mach/mach_host.h> #include <mach/mach_init.h> #include <mach/mach_traps.h> -#include <mach/shared_region.h> #include <mach/task.h> #include <mach/task_info.h> #include <mach/vm_map.h> |