*** empty log message ***

svn path=/trunk/boinc/; revision=3619
2004-06-16 23:29:48 +00:00 · 2004-06-16 23:29:48 +00:00 · 8a3bde0d4b
parent 28fccfb4f0
commit 8a3bde0d4b
22 changed files with 52 additions and 67 deletions
--- a/apps/upper_case.C
+++ b/apps/upper_case.C
@ -26,7 +26,7 @@
 //

 #ifdef _WIN32
-#include "stdafx.h"
+#include "boinc_win.h"
 #endif

 #ifndef _WIN32
--- a/10
+++ b/10
@ -13748,3 +13748,13 @@ David  16 June 2004
 		*.C
 	lib/
 		*.C
+
+Rom    16 June 2004
+	- Additional include changes from stdafx.h to boinc_win.h
+
+	api/
+		*.C
+	client/
+		*.C
+	lib/
+		*.C
--- a/client/dhrystone.C
+++ b/client/dhrystone.C
@ -37,7 +37,7 @@
 // e.g.: no global variables, since we run this multithreaded

 #ifdef _WIN32
-#include "stdafx.h"
+#include "boinc_win.h"
 #endif

 #include <stdlib.h>
--- a/client/stdafx.cpp
+++ b/client/stdafx.cpp
@ -1,28 +0,0 @@
-// The contents of this file are subject to the BOINC Public License
-// Version 1.0 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at
-// http://boinc.berkeley.edu/license_1.0.txt
-// 
-// Software distributed under the License is distributed on an "AS IS"
-// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-// License for the specific language governing rights and limitations
-// under the License. 
-// 
-// The Original Code is the Berkeley Open Infrastructure for Network Computing. 
-// 
-// The Initial Developer of the Original Code is the SETI@home project.
-// Portions created by the SETI@home project are Copyright (C) 2002
-// University of California at Berkeley. All Rights Reserved. 
-// 
-// Contributor(s):
-//
-
-// stdafx.cpp : source file that includes just the standard includes
-// Test.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#ifdef _WIN32
-#include "boinc_win.h"
-#endif
-
-
--- a/client/whetstone.C
+++ b/client/whetstone.C
@ -20,7 +20,7 @@
 // Modified a little to work with BOINC

 #ifdef _WIN32
-#include "stdafx.h"
+#include "boinc_win.h"
 #endif

 #ifndef _WIN32
--- a/client/win/hostinfo_win.cpp
+++ b/client/win/hostinfo_win.cpp
@ -17,7 +17,8 @@
 // Contributor(s):
 //

-#include "stdafx.h"
+#include "boinc_win.h"
+
 #include "client_types.h"
 #include "filesys.h"
 #include "util.h"
--- a/client/win/win_screensaver.cpp
+++ b/client/win/win_screensaver.cpp
@ -19,6 +19,18 @@
 //     Microsoft Knowledge Base Article - 79212
 //

+#include "boinc_win.h"
+
+#include <windowsx.h>
+#include <mmsystem.h>
+#include <regstr.h>
+#include <shlobj.h>
+#define COMPILE_MULTIMON_STUBS
+#include <multimon.h>
+#include <strsafe.h>
+
+#include "boinc_ss.h"
+#include "win_util.h"
 #include "win_screensaver.h"

 //-----------------------------------------------------------------------------
--- a/client/win/win_screensaver.h
+++ b/client/win/win_screensaver.h
@ -22,20 +22,6 @@
 #ifndef _BOINC_H
 #define _BOINC_H

-#include "stdafx.h"
-
-#include <windowsx.h>
-#include <mmsystem.h>
-#include <regstr.h>
-#include <shlobj.h>
-#define COMPILE_MULTIMON_STUBS
-#include <multimon.h>
-#include <strsafe.h>
-
-#include "boinc_ss.h"
-#include "win_util.h"
-
-
 //-----------------------------------------------------------------------------
 // Error codes
 //-----------------------------------------------------------------------------
--- a/client/win/wingui_listctrl.cpp
+++ b/client/win/wingui_listctrl.cpp
@ -18,6 +18,7 @@
 //

 #include "boinc_win.h"
+
 #include "wingui_listctrl.h"

 /////////////////////////////////////////////////////////////////////////
--- a/client/win/wingui_proxydlg.cpp
+++ b/client/win/wingui_proxydlg.cpp
@ -18,6 +18,7 @@
 //

 #include "boinc_win.h"
+
 #include "boinc_gui.h"
 #include "wingui_proxydlg.h"
 #include "wingui.h"
--- a/lib/base64.C
+++ b/lib/base64.C
@ -18,7 +18,7 @@
 //

 #ifdef _WIN32
-#include "stdafx.h"
+#include "boinc_win.h"
 #endif

 #include "base64.h"
--- a/lib/language.C
+++ b/lib/language.C
@ -18,7 +18,7 @@
 //

 #ifdef _WIN32
-#include "stdafx.h"
+#include "boinc_win.h"
 #endif

 #ifndef _WIN32
--- a/lib/msg_log.C
+++ b/lib/msg_log.C
@ -18,7 +18,7 @@
 //

 #ifdef _WIN32
-#include "stdafx.h"
+#include "boinc_win.h"
 #endif

 #ifndef _WIN32
--- a/lib/stackwalker_win.cpp
+++ b/lib/stackwalker_win.cpp
@ -39,7 +39,7 @@
 *//////////////////////////////////////////////////////////////////////////////

 #ifdef _WIN32
-#include "stdafx.h"
+#include "boinc_win.h"
 #endif

 // the form of the output file
--- a/lib/util.C
+++ b/lib/util.C
@ -18,8 +18,8 @@
 //

 #ifdef _WIN32
-#define M_LN2      0.693147180559945309417
 #include "boinc_win.h"
+#define M_LN2      0.693147180559945309417
 #endif

 #ifndef _WIN32
--- a/win_build/RSAEuro.vcproj
+++ b/win_build/RSAEuro.vcproj
@ -81,7 +81,8 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Build\Release\RSAEuro\obj/RSAEuro.pch"
+				PrecompiledHeaderThrough="../lib/boinc_win.h"
+				PrecompiledHeaderFile=".\Build\Release\RSAEuro\obj/boinc_win.pch"
 				AssemblerListingLocation=".\Build\Release\RSAEuro\obj/"
 				ObjectFile=".\Build\Release\RSAEuro\obj/"
 				ProgramDataBaseFileName=".\Build\Release\RSAEuro\obj/"
--- a/win_build/boinc_cli.vcproj
+++ b/win_build/boinc_cli.vcproj
@ -101,8 +101,8 @@
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="../client/StdAfx.h"
-				PrecompiledHeaderFile=".\Build\Release\boinc_cli\obj/boinc_cli.pch"
+				PrecompiledHeaderThrough="../lib/boinc_win.h"
+				PrecompiledHeaderFile=".\Build\Release\boinc_cli\obj/boinc_win.pch"
 				AssemblerListingLocation=".\Build\Release\boinc_cli\obj/"
 				ObjectFile=".\Build\Release\boinc_cli\obj/"
 				ProgramDataBaseFileName=".\Build\Release\boinc_cli\obj/"
--- a/win_build/boinc_dll.vcproj
+++ b/win_build/boinc_dll.vcproj
@ -101,8 +101,8 @@
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="..\client\StdAfx.h"
-				PrecompiledHeaderFile=".\Build\Release\boinc_dll\obj/boinc_dll.pch"
+				PrecompiledHeaderThrough="..\lib\boinc_win.h"
+				PrecompiledHeaderFile=".\Build\Release\boinc_dll\obj/boinc_win.pch"
 				AssemblerListingLocation=".\Build\Release\boinc_dll\obj/"
 				ObjectFile=".\Build\Release\boinc_dll\obj/"
 				ProgramDataBaseFileName=".\Build\Release\boinc_dll\obj/"
--- a/win_build/boinc_gui.vcproj
+++ b/win_build/boinc_gui.vcproj
@ -30,8 +30,8 @@
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="../client/StdAfx.h"
-				PrecompiledHeaderFile=".\Build\Release\boinc_gui\obj/boinc_gui.pch"
+				PrecompiledHeaderThrough="../lib/boinc_win.h"
+				PrecompiledHeaderFile=".\Build\Release\boinc_gui\obj/boinc_win.pch"
 				AssemblerListingLocation=".\Build\Release\boinc_gui\obj/"
 				ObjectFile=".\Build\Release\boinc_gui\obj/"
 				ProgramDataBaseFileName=".\Build\Release\boinc_gui\obj/"
@ -1379,10 +1379,10 @@
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 			<File
-				RelativePath="..\client\win\boinc.bmp">
+				RelativePath="..\client\win\res\boinc.bmp">
 			</File>
 			<File
-				RelativePath="..\client\win\res\boinc.bmp">
+				RelativePath="..\client\win\boinc.bmp">
 			</File>
 			<File
 				RelativePath="..\client\win\boinc_gui.rc">
@ -1402,10 +1402,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\client\win\res\boincsm.bmp">
+				RelativePath="..\client\win\boincsm.bmp">
 			</File>
 			<File
-				RelativePath="..\client\win\boincsm.bmp">
+				RelativePath="..\client\win\res\boincsm.bmp">
 			</File>
 			<File
 				RelativePath="..\res\CoreClient.ico">
--- a/win_build/boinc_guirpc_test.vcproj
+++ b/win_build/boinc_guirpc_test.vcproj
@ -100,8 +100,8 @@
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="../client/StdAfx.h"
-				PrecompiledHeaderFile=".\Build\Release\boinc_guirpctest\obj/boinc_guirpctest.pch"
+				PrecompiledHeaderThrough="../client/boinc_win.h"
+				PrecompiledHeaderFile=".\Build\Release\boinc_guirpctest\obj/boinc_win.pch"
 				AssemblerListingLocation=".\Build\Release\boinc_guirpctest\obj/"
 				ObjectFile=".\Build\Release\boinc_guirpctest\obj/"
 				ProgramDataBaseFileName=".\Build\Release\boinc_guirpctest\obj/"
--- a/win_build/boinc_ss.vcproj
+++ b/win_build/boinc_ss.vcproj
@ -105,8 +105,8 @@
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="../client/StdAfx.h"
-				PrecompiledHeaderFile=".\Build\Release\boinc_ss\obj/boinc_ss.pch"
+				PrecompiledHeaderThrough="../client/boinc_win.h"
+				PrecompiledHeaderFile=".\Build\Release\boinc_ss\obj/boinc_win.pch"
 				AssemblerListingLocation=".\Build\Release\boinc_ss\obj/"
 				ObjectFile=".\Build\Release\boinc_ss\obj/"
 				ProgramDataBaseFileName=".\Build\Release\boinc_ss\obj/"
--- a/win_build/upper_case.vcproj
+++ b/win_build/upper_case.vcproj
@ -32,7 +32,8 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Build\Release\upper_case\obj/upper_case.pch"
+				PrecompiledHeaderThrough="../lib/boinc_win.h"
+				PrecompiledHeaderFile=".\Build\Release\upper_case\obj/boinc_win.pch"
 				AssemblerListingLocation=".\Build\Release\upper_case\obj/"
 				ObjectFile=".\Build\Release\upper_case\obj/"
 				ProgramDataBaseFileName=".\Build\Release\upper_case\obj/"