diff options
| author | Juan Linietsky | 2016-10-30 09:00:45 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-10-30 09:00:45 -0300 |
| commit | ab4126f51061277e87b41c48b40e7b54942d4eca (patch) | |
| tree | c58168b60323c4d43b58743b099e562a89e60a56 /drivers/unix/ip_unix.h | |
| parent | 8b15b26eedad4fdd33d50f5f9aa0fcc1875d503f (diff) | |
| parent | 914015f3b63dd956e72ea937d46ea4b2db005ada (diff) | |
| download | godot-ab4126f51061277e87b41c48b40e7b54942d4eca.tar.gz godot-ab4126f51061277e87b41c48b40e7b54942d4eca.tar.zst godot-ab4126f51061277e87b41c48b40e7b54942d4eca.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'drivers/unix/ip_unix.h')
| -rw-r--r-- | drivers/unix/ip_unix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/unix/ip_unix.h b/drivers/unix/ip_unix.h index c0034c9a3..d198a330e 100644 --- a/drivers/unix/ip_unix.h +++ b/drivers/unix/ip_unix.h @@ -36,7 +36,7 @@ class IP_Unix : public IP { OBJ_TYPE(IP_Unix, IP); - virtual IP_Address _resolve_hostname(const String& p_hostname); + virtual IP_Address _resolve_hostname(const String& p_hostname, IP_Address::AddrType p_type); static IP* _create_unix(); public: |