diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-09-12 10:37:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-12 10:37:23 +0200 |
commit | 5bd0ff003fdd82cf84a557251633ebb83bad4fd5 (patch) | |
tree | 248dc6dfca0e27c3b03533b45753a16d186d2811 /drivers/unix/os_unix.cpp | |
parent | cc71012266f880dcf3b37e40d5f90d9ce8b7a432 (diff) | |
parent | 277b24dfb7acdb42589b931252bbe7be81c7536e (diff) |
Merge pull request #21978 from akien-mga/include-core-absolute
Make core/ includes absolute, remove subfolders from include path
Diffstat (limited to 'drivers/unix/os_unix.cpp')
-rw-r--r-- | drivers/unix/os_unix.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 05dfd69f58..6dba6923c3 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -32,20 +32,18 @@ #ifdef UNIX_ENABLED -#include "servers/visual_server.h" - #include "core/os/thread_dummy.h" -#include "mutex_posix.h" -#include "rw_lock_posix.h" -#include "semaphore_posix.h" -#include "thread_posix.h" - -//#include "core/io/file_access_buffered_fa.h" -#include "dir_access_unix.h" -#include "file_access_unix.h" -#include "packet_peer_udp_posix.h" -#include "stream_peer_tcp_posix.h" -#include "tcp_server_posix.h" +#include "core/project_settings.h" +#include "drivers/unix/dir_access_unix.h" +#include "drivers/unix/file_access_unix.h" +#include "drivers/unix/mutex_posix.h" +#include "drivers/unix/packet_peer_udp_posix.h" +#include "drivers/unix/rw_lock_posix.h" +#include "drivers/unix/semaphore_posix.h" +#include "drivers/unix/stream_peer_tcp_posix.h" +#include "drivers/unix/tcp_server_posix.h" +#include "drivers/unix/thread_posix.h" +#include "servers/visual_server.h" #ifdef __APPLE__ #include <mach-o/dyld.h> @@ -55,7 +53,7 @@ #include <sys/param.h> #include <sys/sysctl.h> #endif -#include "project_settings.h" + #include <assert.h> #include <dlfcn.h> #include <errno.h> |