[Firebird-checkins] SF.net SVN: firebird:[57900] firebird/trunk/src/remote

[<hv...@us...>]

Revision: 57900
          http://sourceforge.net/p/firebird/code/57900
Author:   hvlad
Date:     2013-04-05 07:48:05 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
Fixed Windows build

Modified Paths:
--------------
    firebird/trunk/src/remote/os/win32/wnet.cpp
    firebird/trunk/src/remote/os/win32/xnet.cpp
    firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp

Modified: firebird/trunk/src/remote/os/win32/wnet.cpp
===================================================================
--- firebird/trunk/src/remote/os/win32/wnet.cpp	2013-04-05 07:43:37 UTC (rev 57899)
+++ firebird/trunk/src/remote/os/win32/wnet.cpp	2013-04-05 07:48:05 UTC (rev 57900)
@@ -212,7 +212,7 @@
 	case op_accept:
 		if (cBlock)
 		{
-			cBlock->reset(&file_name);
+			cBlock->resetClnt(&file_name);
 		}
 		accept = &packet->p_acpt;
 		break;
@@ -796,7 +796,7 @@
 #endif
 
 
-static rem_str* make_pipe_name(RefPtr<Config>& config, const TEXT* connect_name, const TEXT* suffix_name,  const TEXT* str_pid)
+static rem_str* make_pipe_name(const RefPtr<Config>& config, const TEXT* connect_name, const TEXT* suffix_name,  const TEXT* str_pid)
 {
 /**************************************
  *

Modified: firebird/trunk/src/remote/os/win32/xnet.cpp
===================================================================
--- firebird/trunk/src/remote/os/win32/xnet.cpp	2013-04-05 07:43:37 UTC (rev 57899)
+++ firebird/trunk/src/remote/os/win32/xnet.cpp	2013-04-05 07:48:05 UTC (rev 57900)
@@ -297,7 +297,7 @@
 	case op_accept:
 		if (cBlock)
 		{
-			cBlock->reset(&file_name);
+			cBlock->resetClnt(&file_name);
 		}
 		accept = &packet->p_acpt;
 		break;
@@ -1024,7 +1024,7 @@
 }
 
 
-static rem_port* connect_client(PACKET* packet, Firebird::RefPtr<Config>* config)
+static rem_port* connect_client(PACKET* packet, const Firebird::RefPtr<Config>* config)
 {
 /**************************************
  *
@@ -1037,7 +1037,7 @@
  *
  **************************************/
 
-	Firebird::RefPtr<Config>& conf(config ? *config : Config::getDefaultConfig());
+	const Firebird::RefPtr<Config>& conf(config ? *config : Config::getDefaultConfig());
 
 	if (!xnet_initialized)
 	{

Modified: firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp
===================================================================
--- firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp	2013-04-05 07:43:37 UTC (rev 57899)
+++ firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp	2013-04-05 07:48:05 UTC (rev 57900)
@@ -245,6 +245,11 @@
 		SetPriorityClass(GetCurrentProcess(), IDLE_PRIORITY_CLASS);
 	}
 
+	{
+		Firebird::MasterInterfacePtr master;
+		master->serverMode(server_flag & SRVR_multi_client ? 1 : 0);
+	}
+
 	TEXT mutex_name[MAXPATHLEN];
 	fb_utils::snprintf(mutex_name, sizeof(mutex_name), SERVER_MUTEX, instance);
 	fb_utils::prefix_kernel_object_name(mutex_name, sizeof(mutex_name));
@@ -390,7 +395,7 @@
 		rem_port* port = NULL;
 		try
 		{
-			port = INET_connect(protocol_inet, NULL, server_flag, 0);
+			port = INET_connect(protocol_inet, NULL, server_flag, 0, NULL);
 		}
 		catch (const Exception& ex)
 		{
@@ -439,7 +444,7 @@
 
 		try
 		{
-			port = WNET_connect(protocol_wnet, NULL, server_flag);
+			port = WNET_connect(protocol_wnet, NULL, server_flag, NULL);
 		}
 		catch (const Exception& ex)
 		{
@@ -490,7 +495,7 @@
 
 		try
 		{
-			port = XNET_connect(NULL, server_flag);
+			port = XNET_connect(NULL, server_flag, NULL);
 		}
 		catch (const Exception& ex)
 		{

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.