*** empty log message ***

svn path=/trunk/boinc/; revision=3031

api/boinc_api.C

@@ -37,10 +37,14 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
+#include <string>
 #include <signal.h>
 #include <fcntl.h>
+#include <algorithm>
 #include <sys/types.h>
 
+using namespace std;
+
 #include "parse.h"
 #include "shmem.h"
 #include "util.h"

api/mfile.C

@@ -21,11 +21,14 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
+#include <string>
 #include <errno.h>
 #if HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
+using namespace std;
+
 #include "filesys.h"
 #include "error_numbers.h"
 #include "boinc_api.h"

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/
+        <Header files>
+    lib/
+        filesys.h
+        language.h
+        parse.h
+        util.h

client/app.h

@@ -20,10 +20,6 @@
 #ifndef _TASK_
 #define _TASK_
 
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
 #ifndef _WIN32
 #include <stdio.h>
 #include <vector>

client/client_messages.C

@@ -17,6 +17,10 @@
 // Contributor(s):
 //
 
+#ifdef _WIN32
+#include "stdafx.h"
+#endif
+
 #include "message.h"
 #include "log_flags.h"
 

client/client_state.h

@@ -20,10 +20,6 @@
 #ifndef _CLIENT_STATE_
 #define _CLIENT_STATE_
 
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
 #ifndef _WIN32
 #include <vector>
 #include <time.h>

client/client_types.h

@@ -27,10 +27,6 @@
 
 #include "cpp.h"
 
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
 #ifndef _WIN32
 #include <stdio.h>
 #include <sys/time.h>

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"

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"

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"

client/log_flags.h

@@ -26,10 +26,6 @@
 #ifndef _LOGFLAGS_H_
 #define _LOGFLAGS_H_
 
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
 #ifndef _WIN32
 #include <stdio.h>
 #endif

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 <stdio.h>
 #endif

client/net_xfer.h

@@ -20,10 +20,6 @@
 #ifndef _NET_XFER_
 #define _NET_XFER_
 
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
 #ifndef _WIN32
 #include <stdio.h>
 #include <time.h>

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 <time.h>
 #endif

client/prefs.h

@@ -20,10 +20,6 @@
 #ifndef _PREFS_
 #define _PREFS_
 
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
 #ifndef _WIN32
 #include <vector>
 #endif

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();

client/ss_logic.h

@@ -38,10 +38,6 @@
 #ifndef _SS_LOGIC_
 #define _SS_LOGIC_
 
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
 #ifndef _WIN32
 #include <time.h>
 #endif

client/stdafx.h

@@ -39,9 +39,9 @@
 //
 #ifndef _CONSOLE
 
-//#ifndef VC_EXTRALEAN
-//#define VC_EXTRALEAN
-//#endif
+#ifndef VC_EXTRALEAN
+#define VC_EXTRALEAN
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxcmn.h>         // MFC support for Windows Common Controls

client/win/wingui.h

@@ -22,8 +22,6 @@
 
 // includes
 
-#include "stdafx.h"
-
 #include "file_names.h"
 #include "filesys.h"
 #include "log_flags.h"

lib/filesys.h

@@ -26,7 +26,6 @@
 
 #ifdef _WIN32
 
-#include "stdafx.h"
 struct DIR_DESC {
     char path[256];
     bool first;

lib/language.h

@@ -26,10 +26,6 @@
 #ifndef _LANGUAGE_H_
 #define _LANGUAGE_H_
 
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
 #ifndef _WIN32
 #include <stdio.h>
 #endif

lib/parse.h

@@ -17,10 +17,6 @@
 // Contributor(s):
 //
 
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
 #ifndef _WIN32
 #include <cstdio>
 #include <cstdlib>

lib/util.h

@@ -20,10 +20,6 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
 #ifndef _WIN32
 #include <cstdlib>
 #include <cstdio>