diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 10:48:57 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 10:48:57 -0300 |
| commit | c2515d352ed9324ec017ff29882d30bc0b3a5a0d (patch) | |
| tree | 3c6ddf5ec4cce813ee334a8ef1682fa823c40194 /drivers | |
| parent | c9ff40e1400c6351c57ec3c5734bc638ee42f3b7 (diff) | |
| parent | c925fbce2da5925009d5f78183e017f9252af35f (diff) | |
Merge pull request #2369 from Max-Might/master
Haiku: platform support
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gl_context/glew.c | 4 | ||||
| -rw-r--r-- | drivers/unix/packet_peer_udp_posix.cpp | 6 | ||||
| -rw-r--r-- | drivers/unix/stream_peer_tcp_posix.cpp | 6 | ||||
| -rw-r--r-- | drivers/unix/tcp_server_posix.cpp | 6 |
4 files changed, 19 insertions, 3 deletions
diff --git a/drivers/gl_context/glew.c b/drivers/gl_context/glew.c index fc0aa28a72..962e82b657 100644 --- a/drivers/gl_context/glew.c +++ b/drivers/gl_context/glew.c @@ -1,3 +1,7 @@ +#ifdef __HAIKU__ + #undef GLEW_ENABLED +#endif + #ifdef GLEW_ENABLED /* ** The OpenGL Extension Wrangler Library diff --git a/drivers/unix/packet_peer_udp_posix.cpp b/drivers/unix/packet_peer_udp_posix.cpp index 26a0b29228..94b4c35923 100644 --- a/drivers/unix/packet_peer_udp_posix.cpp +++ b/drivers/unix/packet_peer_udp_posix.cpp @@ -13,7 +13,11 @@ #include <stdio.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 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 diff --git a/drivers/unix/tcp_server_posix.cpp b/drivers/unix/tcp_server_posix.cpp index 4f9ee62cde..aaca0fe0d8 100644 --- a/drivers/unix/tcp_server_posix.cpp +++ b/drivers/unix/tcp_server_posix.cpp @@ -41,7 +41,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 |