Changeset 4438 in vbox for trunk

Timestamp:

Aug 30, 2007 9:29:17 AM (17 years ago)

Author:

vboxsync

Message:

more fixes, darwin

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/HappyHttp.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -157 +157 @@
 
 src/HappyHttp.cpp_CXXFLAGS.linux += -fexceptions
+src/HappyHttp.cpp_CXXFLAGS.darwin += -fexceptions
 src/VBoxDownloaderWgt.cpp_CXXFLAGS.linux += -fexceptions
+src/VBoxDownloaderWgt.cpp_CXXFLAGS.darwin += -fexceptions
 
 ## @todo how to detect what tool is used?

trunk/src/VBox/Frontends/VirtualBox/src/HappyHttp.cpp

@@ -28 +28 @@
 #include "HappyHttp.h"
 
-#ifndef __WIN32__
+#ifndef RT_OS_WINDOWS
 //  #include <sys/types.h>
     #include <sys/socket.h>
@@ -37 +37 @@
 #endif
 
-#ifdef __WIN32__
+#ifdef RT_OS_WINDOWS
     #include <winsock2.h>
     #define vsnprintf _vsnprintf
@@ -62 +62 @@
 {
 
-#ifdef __WIN32__
+#ifdef RT_OS_WINDOWS
 const char* GetWinsockErrorString( int err );
 #endif
@@ -75 +75 @@
 void BailOnSocketError( const char* context )
 {
-#ifdef __WIN32__
+#ifdef RT_OS_WINDOWS
 
     int e = WSAGetLastError();
@@ -86 +86 @@
 
 
-#ifdef __WIN32__
+#ifdef RT_OS_WINDOWS
 
 const char* GetWinsockErrorString( int err )
@@ -147 +147 @@
 };
 
-#endif // __WIN32__
+#endif // RT_OS_WINDOWS
 
 
@@ -181 +181 @@
     // First try nnn.nnn.nnn.nnn form
     saddr.s_addr = inet_addr(address);
-    if (saddr.s_addr != (in_addr_t)-1)
+    if (saddr.s_addr != INADDR_NONE)
         return &saddr;
 
@@ -277 +277 @@
 void Connection::close()
 {
-#ifdef __WIN32__
+#ifdef RT_OS_WINDOWS
     if( m_Sock >= 0 )
         ::closesocket( m_Sock );
@@ -417 +417 @@
     while( numbytes > 0 )
     {
-#ifdef __WIN32__
+#ifdef RT_OS_WINDOWS
         int n = ::send( m_Sock, (const char*)buf, numbytes, 0 );
 #else