compilation fixes for solaris

PLEASE READ COMPILATION LOGS AFTER MAKING CHANGES!

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 9fa736fdd5ae0210f65cbd1d021e59484cd0a1bf..801921e8aaecdb2f120b8ebc3112a7374a858bad 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -59,6 +59,12 @@
 #include <unistd.h>
 #include <netdb.h>
 
+#ifdef __SUN__
+extern "C" {
+   int gethostname(char *name, int namelen);
+};
+#endif
+
 #endif // __UNIX__
 
 #include "wx/sckaddr.h"
@@ -77,8 +83,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
 wxIPV4address::wxIPV4address()
-{
   m_addr = new sockaddr_in;
+{
   Clear();
 }
 

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 89c1d1546ab556ed85c00437210314685558e22e..d499026b381d301783387a5cc209da6adefc5cc5 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -35,6 +35,8 @@
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
+#include   <unistd.h> // usleep() on solaris
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 89c1d1546ab556ed85c00437210314685558e22e..d499026b381d301783387a5cc209da6adefc5cc5 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -35,6 +35,8 @@
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
+#include   <unistd.h> // usleep() on solaris
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------

diff --git a/src/iodbc/catalog.c b/src/iodbc/catalog.c
index 2e7a25ac54f01a217d4b9bc405f93b3357587bd2..3856e1de29cefe44594d588ec7a1f66ab07bb9ce 100644 (file)
--- a/src/iodbc/catalog.c
+++ b/src/iodbc/catalog.c
@@ -38,6 +38,10 @@
 
 #include       <itrace.h>
 
+#ifndef NULL
+#define NULL 0
+#endif
+
 static RETCODE 
 _iodbcdm_cata_state_ok (
     HSTMT hstmt,