Added (untested) support for sub-locales.

[wxWidgets.git] / src / common / sckaddr.cpp

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 354529e93a8eccc92dee8fad59258bbb95061c1c..e83aa78b2fb114c624ea98c2258f3cf10278b3c2 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -43,14 +43,10 @@
 #endif // __WINDOWS__
 
 #if defined(__UNIX__)
-
 #ifdef VMS
 #include <socket.h>
 #include <in.h>
 #else
-#if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__SUN__)
-#include <sys/types.h>
-#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -59,6 +55,13 @@
 #include <unistd.h>
 #include <netdb.h>
 
+#ifdef __SUN__
+extern "C"
+{
+   struct hostent *gethostbyname(const char *name); 
+};
+#endif
+
 #endif // __UNIX__
 
 #include "wx/sckaddr.h"
@@ -77,8 +80,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
 wxIPV4address::wxIPV4address()
-  m_addr = new sockaddr_in;
 {
+  m_addr = new sockaddr_in;
   Clear();
 }
 
@@ -192,7 +195,11 @@ wxString wxIPV4address::Hostname()
 
   h_ent = gethostbyaddr((char *)&(m_addr->sin_addr), sizeof(m_addr->sin_addr),
                        GetFamily());
-  return wxString(h_ent->h_name);
+                       
+  if (!h_ent)
+     return wxString("");
+  else
+     return wxString(h_ent->h_name);
 }
 
 unsigned short wxIPV4address::Service()