From 69919241d35e5382ca7800dd47562ff92d2918cf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Karsten=20Ball=C3=BCder?= <ballueder@usa.net>
Date: Tue, 26 Jan 1999 11:08:48 +0000
Subject: [PATCH] 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
---
 src/common/sckaddr.cpp | 8 +++++++-
 src/gtk/app.cpp        | 2 ++
 src/gtk1/app.cpp       | 2 ++
 src/iodbc/catalog.c    | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 9fa736fdd5..801921e8aa 100644
--- 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 89c1d1546a..d499026b38 100644
--- 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 89c1d1546a..d499026b38 100644
--- 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 2e7a25ac54..3856e1de29 100644
--- 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,
-- 
2.47.2