More compilation fixes for Solaris. :-<

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 4f90e220e902a5f44075caa68e5232c9a76db737..80c8bf09e848954e5edeb23e38cfc7595d2a29f6 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -13,6 +13,16 @@
 #pragma implementation "http.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "wx/string.h"
@@ -22,10 +32,6 @@
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 IMPLEMENT_PROTOCOL(wxHTTP, "http", "80", TRUE)
@@ -46,7 +52,7 @@ wxHTTP::wxHTTP()
 wxHTTP::~wxHTTP()
 {
   // wxString isn't a wxObject
-  wxNode *node = m_headers.First(); 
+  wxNode *node = m_headers.First();
   wxString *string;
 
   while (node) {
@@ -82,7 +88,7 @@ wxString wxHTTP::GetHeader(const wxString& header)
 {
   wxNode *node = m_headers.Find(header);
   if (!node)
-    return (char *)NULL;
+    return wxEmptyString;
 
   return *((wxString *)node->Data());
 }
@@ -91,12 +97,14 @@ void wxHTTP::SendHeaders()
 {
   wxNode *head = m_headers.First();
 
-  while (head) {
+  while (head)
+  {
     wxString *str = (wxString *)head->Data();
-    char buf[100];
 
-    sprintf(buf, "%s: %s\n\r", head->key.string, str->GetData());
-    Write(buf, strlen(buf));
+    wxString buf;
+    buf.Printf("%s: %s\n\r", head->GetKeyString(), str->GetData());
+
+    Write(buf, buf.Len());
 
     head = head->Next();
   }
@@ -158,7 +166,7 @@ bool wxHTTP::Connect(const wxString& host)
   return TRUE;
 }
 
-bool wxHTTP::Connect(wxSockAddress& addr)
+bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 {
   struct sockaddr *raw_addr;
   size_t len;