[mb-commits] r7694 - in libmusicbrainz/branches/xmlws/lib: . http

Author: luks
Date: 2006-05-27 00:02:49 +0000 (Sat, 27 May 2006)
New Revision: 7694

Removed:
   libmusicbrainz/branches/xmlws/lib/test.cpp
Modified:
   libmusicbrainz/branches/xmlws/lib/http/comhttpsocket.cpp
   libmusicbrainz/branches/xmlws/lib/http/http.cpp
   libmusicbrainz/branches/xmlws/lib/http/wincomsocket.h
Log:
Updated include paths in files from lib/http. Removed one mistakenly imported 
file.

Modified: libmusicbrainz/branches/xmlws/lib/http/comhttpsocket.cpp
===================================================================
--- libmusicbrainz/branches/xmlws/lib/http/comhttpsocket.cpp    2006-05-26 
23:55:19 UTC (rev 7693)
+++ libmusicbrainz/branches/xmlws/lib/http/comhttpsocket.cpp    2006-05-27 
00:02:49 UTC (rev 7694)
@@ -12,10 +12,10 @@
 
 #include "comhttpsocket.h"
 #ifdef WIN32
-#include "../config_win32.h"
+#include "config_win32.h"
 #include "wincomsocket.h"
 #else
-#include "../config.h"
+#include "config.h"
 #include "comsocket.h"
 #endif
 #include <stdlib.h>

Modified: libmusicbrainz/branches/xmlws/lib/http/http.cpp
===================================================================
--- libmusicbrainz/branches/xmlws/lib/http/http.cpp     2006-05-26 23:55:19 UTC 
(rev 7693)
+++ libmusicbrainz/branches/xmlws/lib/http/http.cpp     2006-05-27 00:02:49 UTC 
(rev 7694)
@@ -56,9 +56,8 @@
 #endif
 
 #include "http.h"
-#include "musicbrainz.h"
 #ifdef WIN32
-#include "../config_win32.h"
+#include "config_win32.h"
 #else
 #include "config.h"
 #endif

Modified: libmusicbrainz/branches/xmlws/lib/http/wincomsocket.h
===================================================================
--- libmusicbrainz/branches/xmlws/lib/http/wincomsocket.h       2006-05-26 
23:55:19 UTC (rev 7693)
+++ libmusicbrainz/branches/xmlws/lib/http/wincomsocket.h       2006-05-27 
00:02:49 UTC (rev 7694)
@@ -30,8 +30,26 @@
 //#include "mutex.h"
 #include <stdio.h>
 #include <string>
-#include "apsutility.h"
 
+#ifdef WIN32
+#include <winsock.h>
+#include <time.h>
+#else
+#define INVALID_SOCKET -1
+#define SOCKET_ERROR -1
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#ifndef __BEOS__
+#include <arpa/inet.h>
+#include <unistd.h>
+#define Sleep(x) usleep(x*1000)
+#else
+#include <be/kernel/OS.h>
+#define Sleep(x) snooze(x*1000)
+#endif
+#endif
+
 //class COMServerSocket;
 
 /**Wraps the OS specifics of a client socket.

Deleted: libmusicbrainz/branches/xmlws/lib/test.cpp