From ffbd3fdcd9f777daac5851cad56cebdbfaf18022 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 21 Jan 2004 22:54:35 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=2914
---
 checkin_notes              | 10 ++++++++++
 client/gui_rpc_server.C    | 14 ++++++++++----
 win_build/boinc.sln        | 11 -----------
 win_build/boinc_cli.vcproj |  6 ++++++
 win_build/boinc_gui.vcproj | 14 ++++++++++----
 5 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 1756080d5c..8e44648c7b 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9423,3 +9423,13 @@ David  Jan 20 2004
     lib/
         parse.C
         util.C,h
+
+David  Jan 21 2004
+	- get new GUI RPC stuff to compile on Win
+
+	client/
+		gui_rpc_server.C
+	win_build/
+		boinc.sln
+		boinc_cli.vcproj
+		boinc_gui.vcproj
diff --git a/client/gui_rpc_server.C b/client/gui_rpc_server.C
index e6ddaf7f88..169d03870b 100644
--- a/client/gui_rpc_server.C
+++ b/client/gui_rpc_server.C
@@ -1,9 +1,11 @@
-#include <vector.h>
 #include <stdio.h>
+#ifndef _WIN32
 #include <unistd.h>
-#include <string.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <vector>
+#endif
+#include <string.h>
 
 #include "parse.h"
 #include "client_state.h"
@@ -16,11 +18,14 @@ GUI_RPC_CONN::GUI_RPC_CONN(int s) {
 }
 
 GUI_RPC_CONN::~GUI_RPC_CONN() {
+#ifndef _WIN32
     close(sock);
     fclose(fout);
+#endif
 }
 
 int GUI_RPC_CONN::handle_rpc() {
+#ifndef _WIN32
     char buf[256];
     int n;
     unsigned int i;
@@ -40,7 +45,8 @@ int GUI_RPC_CONN::handle_rpc() {
         fprintf(fout, "<unrecognized/>\n");
     }
     fflush(fout);
-    return 0;
+#endif
+   return 0;
 }
 
 int GUI_RPC_CONN_SET::insert(GUI_RPC_CONN* p) {
@@ -49,10 +55,10 @@ int GUI_RPC_CONN_SET::insert(GUI_RPC_CONN* p) {
 }
 
 void GUI_RPC_CONN_SET::init(char* path) {
+#ifndef _WIN32
     sockaddr_un addr;
     int retval;
 
-#ifndef _WIN32
     unlink(path);
     addr.sun_family = AF_UNIX;
     strcpy(addr.sun_path, path);
diff --git a/win_build/boinc.sln b/win_build/boinc.sln
index bb94da91a2..0e2c7d3ce3 100644
--- a/win_build/boinc.sln
+++ b/win_build/boinc.sln
@@ -29,13 +29,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "upper_case", "upper_case.vc
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc", "boinc.vcproj", "{7B303283-CC77-4B25-BE1B-66E80ADB105A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{264D5059-0A60-4B6E-8979-245BC31141FE} = {264D5059-0A60-4B6E-8979-245BC31141FE}
-		{21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174}
-		{0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -66,10 +59,6 @@ Global
 		{48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Debug.Build.0 = Debug|Win32
 		{48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Release.ActiveCfg = Release|Win32
 		{48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Release.Build.0 = Release|Win32
-		{7B303283-CC77-4B25-BE1B-66E80ADB105A}.Debug.ActiveCfg = Debug|Win32
-		{7B303283-CC77-4B25-BE1B-66E80ADB105A}.Debug.Build.0 = Debug|Win32
-		{7B303283-CC77-4B25-BE1B-66E80ADB105A}.Release.ActiveCfg = Release|Win32
-		{7B303283-CC77-4B25-BE1B-66E80ADB105A}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/win_build/boinc_cli.vcproj b/win_build/boinc_cli.vcproj
index 809f571f02..270b04731f 100644
--- a/win_build/boinc_cli.vcproj
+++ b/win_build/boinc_cli.vcproj
@@ -565,6 +565,9 @@
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\client\gui_rpc_server.C">
+			</File>
 			<File
 				RelativePath="..\Client\Hostinfo.c">
 				<FileConfiguration
@@ -1105,6 +1108,9 @@
 			<File
 				RelativePath="..\client\filesys.h">
 			</File>
+			<File
+				RelativePath="..\client\gui_rpc_server.h">
+			</File>
 			<File
 				RelativePath="..\client\hostinfo.h">
 			</File>
diff --git a/win_build/boinc_gui.vcproj b/win_build/boinc_gui.vcproj
index 43bca5b14d..183e2a23ca 100644
--- a/win_build/boinc_gui.vcproj
+++ b/win_build/boinc_gui.vcproj
@@ -570,6 +570,9 @@
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\client\gui_rpc_server.C">
+			</File>
 			<File
 				RelativePath="..\client\gui_titles.C">
 				<FileConfiguration
@@ -1311,6 +1314,9 @@
 			<File
 				RelativePath="..\lib\filesys.h">
 			</File>
+			<File
+				RelativePath="..\client\gui_rpc_server.h">
+			</File>
 			<File
 				RelativePath="..\client\gui_titles.h">
 			</File>
@@ -1405,18 +1411,18 @@
 		<Filter
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-			<File
-				RelativePath="..\client\win\res\boinc.bmp">
-			</File>
 			<File
 				RelativePath="..\client\win\boinc.bmp">
 			</File>
 			<File
-				RelativePath="..\client\win\res\boincsm.bmp">
+				RelativePath="..\client\win\res\boinc.bmp">
 			</File>
 			<File
 				RelativePath="..\client\win\boincsm.bmp">
 			</File>
+			<File
+				RelativePath="..\client\win\res\boincsm.bmp">
+			</File>
 			<File
 				RelativePath="..\res\CoreClient.ico">
 			</File>