diff options
| author | Carl Olsson | 2015-02-11 21:15:49 +1000 |
|---|---|---|
| committer | Carl Olsson | 2015-02-11 21:15:49 +1000 |
| commit | 573ae5dd926df0dbd63b787945ace0fa76f08976 (patch) | |
| tree | ca21f025cab021fdb43d6a7b77222c4bcf62f63a /drivers/unix/ip_unix.cpp | |
| parent | 9171f71ff55def0f661a3d76e4ebcfc945092ad3 (diff) | |
| parent | 78a268c2eb3099103164407761e06afa0c6339d4 (diff) | |
| download | godot-573ae5dd926df0dbd63b787945ace0fa76f08976.tar.gz godot-573ae5dd926df0dbd63b787945ace0fa76f08976.tar.zst godot-573ae5dd926df0dbd63b787945ace0fa76f08976.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
demos/2d/polygon_path_finder_demo/.fscache
Diffstat (limited to 'drivers/unix/ip_unix.cpp')
| -rw-r--r-- | drivers/unix/ip_unix.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp index 841160f94..ad0d4e00e 100644 --- a/drivers/unix/ip_unix.cpp +++ b/drivers/unix/ip_unix.cpp @@ -50,11 +50,16 @@ #ifdef ANDROID_ENABLED #include "platform/android/ifaddrs_android.h" #else + #ifdef __FreeBSD__ + #include <sys/types.h> + #endif #include <ifaddrs.h> #endif #include <arpa/inet.h> #include <sys/socket.h> - + #ifdef __FreeBSD__ + #include <netinet/in.h> + #endif #endif IP_Address IP_Unix::_resolve_hostname(const String& p_hostname) { |