--- parser3/src/main/pa_socks.C 2002/08/01 11:41:19 1.16 +++ parser3/src/main/pa_socks.C 2003/01/31 12:34:37 1.18.2.3 @@ -1,24 +1,25 @@ /** @file Parser: socks initialization/finalization. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_SOCKS_C="$Date: 2002/08/01 11:41:19 $"; +static const char* IDENT_SOCKS_C="$Date: 2003/01/31 12:34:37 $"; #define NO_UNISTD_H #include "pa_config_includes.h" -#ifndef HAVE_SYS_SELECT_H +#ifdef HAVE_WINSOCK_H #include "pa_exception.h" #include "pa_socks.h" +#include "pa_string.h" #include WSADATA wsaData; -void init_socks(Pool& pool) { +void pa_init_socks() { WORD wVersionRequested; int err; wVersionRequested = MAKEWORD( 1, 1 ); @@ -28,13 +29,13 @@ void init_socks(Pool& pool) { /* Tell the user that we could not find a usable */ /* WinSock DLL. */ throw Exception(0, - 0, + Exception::undefined_source, "can not WSAStartup, err=%d", err); } } -void done_socks() { +void pa_done_socks() { /* Confirm that the WinSock DLL supports 2.2.*/ /* Note that if the DLL supports versions greater */ /* than 2.2 in addition to 2.2, it will still return */ @@ -49,9 +50,7 @@ void done_socks() { #else -#include "pa_pool.h" - -void init_socks(Pool& pool) {} -void done_socks() {} +void pa_init_socks() {} +void pa_done_socks() {} #endif