diff options
Diffstat (limited to 'dep')
| -rw-r--r-- | dep/include/sockets/socket_include.h | 16 | ||||
| -rw-r--r-- | dep/src/g3dlite/System.cpp | 4 | ||||
| -rw-r--r-- | dep/src/sockets/SocketHandler.cpp | 1 | ||||
| -rw-r--r-- | dep/src/sockets/StdoutLog.cpp | 3 | ||||
| -rw-r--r-- | dep/src/sockets/TcpSocket.cpp | 1 |
5 files changed, 17 insertions, 8 deletions
diff --git a/dep/include/sockets/socket_include.h b/dep/include/sockets/socket_include.h index 31960ccee05..dcfd4acfbd6 100644 --- a/dep/include/sockets/socket_include.h +++ b/dep/include/sockets/socket_include.h @@ -150,14 +150,14 @@ namespace SOCKETS_NAMESPACE { # error FreeBSD versions prior to 400014 does not support ipv6 # endif -#elif defined __NetBSD__ -# if !defined(MSG_NOSIGNAL) -# define MSG_NOSIGNAL 0 -# endif -# include <netinet/in.h> -typedef in_addr_t ipaddr_t; -typedef in_port_t port_t; -#elif defined MACOSX +#elif defined (__NetBSD__) || defined (__OpenBSD__) +# if !defined(MSG_NOSIGNAL) +# define MSG_NOSIGNAL 0 +# endif +# include <netinet/in.h> +typedef in_addr_t ipaddr_t; +typedef in_port_t port_t; +#elif defined MACOSX // ---------------------------------------- // Mac OS X #include <string.h> diff --git a/dep/src/g3dlite/System.cpp b/dep/src/g3dlite/System.cpp index cb7169a4c4d..88fd39b52ca 100644 --- a/dep/src/g3dlite/System.cpp +++ b/dep/src/g3dlite/System.cpp @@ -23,6 +23,10 @@ #include "G3D/debug.h" #include "G3D/format.h" +#if defined(__OpenBSD__) + #include <stdint.h> +#endif + #ifdef G3D_WIN32 #include <conio.h> diff --git a/dep/src/sockets/SocketHandler.cpp b/dep/src/sockets/SocketHandler.cpp index 7ade1e99eb6..48bd1a6f61c 100644 --- a/dep/src/sockets/SocketHandler.cpp +++ b/dep/src/sockets/SocketHandler.cpp @@ -34,6 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif #include <stdlib.h> #include <errno.h> +#include <cstdio> #include "SocketHandler.h" #include "UdpSocket.h" diff --git a/dep/src/sockets/StdoutLog.cpp b/dep/src/sockets/StdoutLog.cpp index 054b8489bb3..092e014a68f 100644 --- a/dep/src/sockets/StdoutLog.cpp +++ b/dep/src/sockets/StdoutLog.cpp @@ -30,6 +30,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifdef _MSC_VER #pragma warning(disable:4786) #endif + +#include <cstdio> + #include "ISocketHandler.h" #include "Socket.h" #include "StdoutLog.h" diff --git a/dep/src/sockets/TcpSocket.cpp b/dep/src/sockets/TcpSocket.cpp index 9dab541eebe..523b83464bd 100644 --- a/dep/src/sockets/TcpSocket.cpp +++ b/dep/src/sockets/TcpSocket.cpp @@ -44,6 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <openssl/err.h> #endif #include <map> +#include <cstdio> #include "TcpSocket.h" #include "Utility.h" |