--- parser3/src/main/pa_socks.C	2001/06/28 07:44:17	1.5
+++ parser3/src/main/pa_socks.C	2003/01/21 15:51:15	1.18
@@ -1,31 +1,20 @@
 /**	@file
 	Parser: socks initialization/finalization.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-static const char *RCSId="$Id: pa_socks.C,v 1.5 2001/06/28 07:44:17 parser Exp $"; 
+
+static const char* IDENT_SOCKS_C="$Date: 2003/01/21 15:51:15 $";
 
 #define NO_UNISTD_H
 #include "pa_config_includes.h"
 
-#ifdef WIN32
-#include <winsock.h>
-#else
-//#include <netinet/tcp.h>
-//#include <arpa/nameser.h>
-//#include <netdb.h>
-//#include <signal.h>
-#endif
-
-#include "pa_socks.h"
+#ifdef HAVE_WINSOCK_H
 #include "pa_exception.h"
+#include "pa_socks.h"
 
-
-/* ************************ Common stuff *********************** */
-
-#ifdef WIN32
+#include <winsock.h>
 
 WSADATA wsaData;
 
@@ -38,7 +27,7 @@ void init_socks(Pool& pool) {
 	if ( err != 0 ) {
 	    /* Tell the user that we could not find a usable */
 		/* WinSock DLL.                                  */    
-		PTHROW(0, 0,
+		throw Exception(0,
 			0,
 			"can not WSAStartup, err=%d", 
 				err);
@@ -60,6 +49,8 @@ void done_socks() {
 
 #else
 
+#include "pa_pool.h"
+
 void init_socks(Pool& pool) {}
 void done_socks() {}