Merge pull request #5663 from bertmsk:patch-1

3cb76d5c · Maksim Shabunin · 047bda32 · d3b0bda0 · 3cb76d5c
隐藏空白更改
内联并排

Showing with 3 addition and 1 deletion

modules/core/src/system.cpp modules/core/src/system.cpp +3 -1

未找到文件。
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -64,12 +64,14 @@ Mutex* __initialization_mutex_initializer = &getInitializationMutex();
 # endif
 #endif

-#if defined ANDROID || defined __linux__
+#if defined ANDROID || defined __linux__ || defined __FreeBSD__
 #  include <unistd.h>
 #  include <fcntl.h>
 #  include <elf.h>
+#if defined ANDROID || defined __linux__
 #  include <linux/auxvec.h>
 #endif
+#endif

 #if defined WIN32 || defined _WIN32 || defined WINCE
 #ifndef _WIN32_WINNT           // This is needed for the declaration of TryEnterCriticalSection in winbase.h with Visual Studio 2005 (and older?)