summaryrefslogtreecommitdiffstats
path: root/drivers/unix/stream_peer_tcp_posix.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-10-17 12:48:47 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-10-17 12:48:47 -0300
commit6f9631fc5151b3267c6fcea5f70249fc36814db8 (patch)
tree2aa06230d95846602aa731967264c1619baa2a39 /drivers/unix/stream_peer_tcp_posix.cpp
parent63033aa646f7a49fbcecbc8cc30077cf268be10c (diff)
parentbe0f7563fbff581ca072504978bedc6a55e180f1 (diff)
downloadredot-engine-6f9631fc5151b3267c6fcea5f70249fc36814db8.tar.gz
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'drivers/unix/stream_peer_tcp_posix.cpp')
-rw-r--r--drivers/unix/stream_peer_tcp_posix.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/unix/stream_peer_tcp_posix.cpp b/drivers/unix/stream_peer_tcp_posix.cpp
index 2301d8b6c4..5aa3915893 100644
--- a/drivers/unix/stream_peer_tcp_posix.cpp
+++ b/drivers/unix/stream_peer_tcp_posix.cpp
@@ -39,7 +39,11 @@
#include <netdb.h>
#include <sys/types.h>
#ifndef NO_FCNTL
-#include <sys/fcntl.h>
+ #ifdef __HAIKU__
+ #include <fcntl.h>
+ #else
+ #include <sys/fcntl.h>
+ #endif
#else
#include <sys/ioctl.h>
#endif