diff --git a/api/boinc_api.C b/api/boinc_api.C index ea18038343..1703e2eda0 100644 --- a/api/boinc_api.C +++ b/api/boinc_api.C @@ -37,10 +37,14 @@ #include #include #include +#include #include #include +#include #include +using namespace std; + #include "parse.h" #include "shmem.h" #include "util.h" diff --git a/api/mfile.C b/api/mfile.C index be8b61334e..9bb15fdf6d 100644 --- a/api/mfile.C +++ b/api/mfile.C @@ -21,11 +21,14 @@ #include #include #include +#include #include #if HAVE_MALLOC_H #include #endif +using namespace std; + #include "filesys.h" #include "error_numbers.h" #include "boinc_api.h" diff --git a/checkin_notes b/checkin_notes index e30d97caee..a4db134c2e 100755 --- a/checkin_notes +++ b/checkin_notes @@ -10340,3 +10340,17 @@ Rom Mar 4 2004 (from John Keck) client/ client_state.h cs_scheduler.c + +Rom Mar 4 2004 + - More Windows header file cleanup. + + api/ + boinc_api.c + mfile.c + client/ +
+ lib/ + filesys.h + language.h + parse.h + util.h diff --git a/client/app.h b/client/app.h index 1f9eb0b176..2f62bcb184 100644 --- a/client/app.h +++ b/client/app.h @@ -20,10 +20,6 @@ #ifndef _TASK_ #define _TASK_ -#ifdef _WIN32 -#include "stdafx.h" -#endif - #ifndef _WIN32 #include #include diff --git a/client/client_messages.C b/client/client_messages.C index 3ff93cee12..c7bf6c228b 100644 --- a/client/client_messages.C +++ b/client/client_messages.C @@ -17,6 +17,10 @@ // Contributor(s): // +#ifdef _WIN32 +#include "stdafx.h" +#endif + #include "message.h" #include "log_flags.h" diff --git a/client/client_state.h b/client/client_state.h index 5dac2cdf1c..f117af72ab 100644 --- a/client/client_state.h +++ b/client/client_state.h @@ -20,10 +20,6 @@ #ifndef _CLIENT_STATE_ #define _CLIENT_STATE_ -#ifdef _WIN32 -#include "stdafx.h" -#endif - #ifndef _WIN32 #include #include diff --git a/client/client_types.h b/client/client_types.h index 1e68c0c77c..6a6b1e7d65 100644 --- a/client/client_types.h +++ b/client/client_types.h @@ -27,10 +27,6 @@ #include "cpp.h" -#ifdef _WIN32 -#include "stdafx.h" -#endif - #ifndef _WIN32 #include #include diff --git a/client/cs_prefs.C b/client/cs_prefs.C index 7453eda764..9689e79faa 100644 --- a/client/cs_prefs.C +++ b/client/cs_prefs.C @@ -21,6 +21,10 @@ // when to compute, how much disk to use, etc. // +#ifdef _WIN32 +#include "stdafx.h" +#endif + #include "filesys.h" #include "file_names.h" #include "cpu_benchmark.h" diff --git a/client/cs_statefile.C b/client/cs_statefile.C index ce519c2805..0b3d05f59e 100644 --- a/client/cs_statefile.C +++ b/client/cs_statefile.C @@ -17,6 +17,10 @@ // Contributor(s): // +#ifdef _WIN32 +#include "stdafx.h" +#endif + #include "parse.h" #include "error_numbers.h" #include "filesys.h" diff --git a/client/file_xfer.C b/client/file_xfer.C index a5629afa39..d1d96483e2 100644 --- a/client/file_xfer.C +++ b/client/file_xfer.C @@ -19,6 +19,10 @@ #include "cpp.h" +#ifdef _WIN32 +#include "stdafx.h" +#endif + #include "util.h" #include "file_names.h" #include "client_state.h" diff --git a/client/log_flags.h b/client/log_flags.h index 23e16820df..ebefb7e9ea 100644 --- a/client/log_flags.h +++ b/client/log_flags.h @@ -26,10 +26,6 @@ #ifndef _LOGFLAGS_H_ #define _LOGFLAGS_H_ -#ifdef _WIN32 -#include "stdafx.h" -#endif - #ifndef _WIN32 #include #endif diff --git a/client/net_stats.h b/client/net_stats.h index 2e05f29225..1a50e5b782 100644 --- a/client/net_stats.h +++ b/client/net_stats.h @@ -21,10 +21,6 @@ // namely exponentially weighted averages of upload and download speeds // -#ifdef _WIN32 -#include "stdafx.h" -#endif - #ifndef _WIN32 #include #endif diff --git a/client/net_xfer.h b/client/net_xfer.h index 80608c03c7..435662cf8d 100644 --- a/client/net_xfer.h +++ b/client/net_xfer.h @@ -20,10 +20,6 @@ #ifndef _NET_XFER_ #define _NET_XFER_ -#ifdef _WIN32 -#include "stdafx.h" -#endif - #ifndef _WIN32 #include #include diff --git a/client/pers_file_xfer.h b/client/pers_file_xfer.h index 5ec663d4f7..f11046a93a 100644 --- a/client/pers_file_xfer.h +++ b/client/pers_file_xfer.h @@ -20,10 +20,6 @@ #ifndef _PERS_FILE_XFER_H #define _PERS_FILE_XFER_H -#ifdef _WIN32 -#include "stdafx.h" -#endif - #ifndef _WIN32 #include #endif diff --git a/client/prefs.h b/client/prefs.h index dbfee67448..ce716b1eb8 100644 --- a/client/prefs.h +++ b/client/prefs.h @@ -20,10 +20,6 @@ #ifndef _PREFS_ #define _PREFS_ -#ifdef _WIN32 -#include "stdafx.h" -#endif - #ifndef _WIN32 #include #endif diff --git a/client/ss_logic.C b/client/ss_logic.C index 4fd05a7dc3..2b823d0d3c 100644 --- a/client/ss_logic.C +++ b/client/ss_logic.C @@ -17,8 +17,11 @@ // Contributor(s): // -#include "client_state.h" +#ifdef _WIN32 +#include "stdafx.h" +#endif +#include "client_state.h" #include "ss_logic.h" extern void create_curtain(); diff --git a/client/ss_logic.h b/client/ss_logic.h index d965133fde..c16edfc908 100644 --- a/client/ss_logic.h +++ b/client/ss_logic.h @@ -38,10 +38,6 @@ #ifndef _SS_LOGIC_ #define _SS_LOGIC_ -#ifdef _WIN32 -#include "stdafx.h" -#endif - #ifndef _WIN32 #include #endif diff --git a/client/stdafx.h b/client/stdafx.h index 1bca3d358d..6ec0d4c827 100644 --- a/client/stdafx.h +++ b/client/stdafx.h @@ -39,9 +39,9 @@ // #ifndef _CONSOLE -//#ifndef VC_EXTRALEAN -//#define VC_EXTRALEAN -//#endif +#ifndef VC_EXTRALEAN +#define VC_EXTRALEAN +#endif #include // MFC core and standard components #include // MFC support for Windows Common Controls diff --git a/client/win/wingui.h b/client/win/wingui.h index 1d2e458f6e..04df3397a9 100755 --- a/client/win/wingui.h +++ b/client/win/wingui.h @@ -22,8 +22,6 @@ // includes -#include "stdafx.h" - #include "file_names.h" #include "filesys.h" #include "log_flags.h" diff --git a/lib/filesys.h b/lib/filesys.h index 2559a0d85f..9c60f94766 100755 --- a/lib/filesys.h +++ b/lib/filesys.h @@ -26,7 +26,6 @@ #ifdef _WIN32 -#include "stdafx.h" struct DIR_DESC { char path[256]; bool first; diff --git a/lib/language.h b/lib/language.h index 6ed25fa288..1ec278c9f2 100755 --- a/lib/language.h +++ b/lib/language.h @@ -26,10 +26,6 @@ #ifndef _LANGUAGE_H_ #define _LANGUAGE_H_ -#ifdef _WIN32 -#include "stdafx.h" -#endif - #ifndef _WIN32 #include #endif diff --git a/lib/parse.h b/lib/parse.h index 70819e251a..71f78c8971 100644 --- a/lib/parse.h +++ b/lib/parse.h @@ -17,10 +17,6 @@ // Contributor(s): // -#ifdef _WIN32 -#include "stdafx.h" -#endif - #ifndef _WIN32 #include #include diff --git a/lib/util.h b/lib/util.h index 42c436fe36..e1dc47fab3 100755 --- a/lib/util.h +++ b/lib/util.h @@ -20,10 +20,6 @@ #ifndef UTIL_H #define UTIL_H -#ifdef _WIN32 -#include "stdafx.h" -#endif - #ifndef _WIN32 #include #include