*** empty log message ***

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

checkin_notes

@@ -25847,7 +25847,7 @@ Charlie    11 Mar 2005
     and SETI@home application using XCODE IDE on Macintosh.
     Removed Eric Heien's old boinc.pbroj which is confusing 
     on CVS because it is a bundle, which looks like a directory
-    to CVS.  New boinc.proj bundle is checked in zipped.
+    to CVS.  New boinc.pbproj bundle is checked in zipped.
 
     - Changes for Mac GUI BOINC manager and core client.
     Major rework of XCode project file.
@@ -25867,8 +25867,8 @@ Charlie    11 Mar 2005
     lib/
         hostinfo.h
     mac_build/
-        boinc.proj/boinc.proj (directory & file both removed)
-        boinc.proj.zip (new)
+        boinc.pbproj/project.pbxproj (directory & file both removed)
+        boinc.pbproj.zip (new)
         info.plist (new)
         HowToBuildBOINC_XCode.rtf
 
@@ -26189,7 +26189,7 @@ Charlie    25 Mar 2005
     mac_build/
         Info.plist (add)
         SystemMenu-Info.plist (add)
-        boinc.pbproj/boinc.pbproj (add)
+        boinc.pbproj/project.pbxproj (add)
 
 Charlie    26 Mar 2005
     - BOINC Manager: Workaround apparent bug in Mac version of WxWidgets which 
@@ -26200,7 +26200,8 @@ Charlie    26 Mar 2005
     clientGUI/
         MainFrame.cpp
     mac_build/
-        boinc.pbproj/boinc.pbproj
+        boinc.pbproj/
+            project.pbxproj
 
 Rom    28 Mar 2005
     - Well now that I've fully tested and deployed BOINC via Active Directory,
@@ -26372,7 +26373,8 @@ Charlie    29 Mar 2005
     clientGUI/mac/
             SetVersion.C (add)
     mac_build/
-        boinc.pbproj/boinc.pbproj
+        boinc.pbproj/
+            project.pbxproj
 
 David  30 Mar 2005
     - Fixed bug where clients report a result CPU time as zero,
@@ -27184,3 +27186,17 @@ Bruce 14 April 2005
     sched/
         file_upload_handler.C
 
+Charlie    15 April 2005
+    Mac: Fix compile errors for BOINC Manager.
+        
+    client/
+        net_xfer.C
+    clientgui/
+        BOINCGUIApp.cpp
+        MainDocument.cpp
+    mac_build/
+        boinc.pbproj/
+            project.pbxproj
+        English.lproj/
+            InfoPlist.strings
+

client/net_xfer.C

@@ -37,6 +37,7 @@
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>

clientgui/BOINCGUIApp.h

@@ -24,17 +24,19 @@
 #pragma interface "BOINCGUIApp.cpp"
 #endif
 
-
 #include "LogBOINC.h"
 #include "MainFrame.h"
-#include "MainDocument.h"
+
 #ifndef NOTASKBAR
-#include "BOINCTaskBar.h"
+#include "BOINCTaskBar.h"   // Must be included before MainDocument.h
 #ifdef __APPLE__
-#include "MacSysMenu.h"
+#include "MacSysMenu.h"     // Must be included before MainDocument.h
 #endif
 #endif
 
+#include "MainDocument.h"
+
+
 
 class CBOINCGUIApp : public wxApp {
     DECLARE_DYNAMIC_CLASS(CBOINCGUIApp)

clientgui/MainDocument.cpp

@@ -26,6 +26,13 @@
 #include "MainDocument.h"
 #include "error_numbers.h"
 
+#ifdef __APPLE__
+// The Mac uses WxWidgets 2.5.3.  The version 2.5.3 log.h file now says:
+    // there is no more unconditional LogTrace: it is not different from
+    // LogDebug and it creates overload ambiguities
+    inline void wxLogTrace(const wxChar *, ...) { }
+#endif
+
 
 CNetworkConnection::CNetworkConnection(CMainDocument* pDocument) :
     wxObject() {

mac_build/English.lproj/InfoPlist.strings

@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "BOINC";
-CFBundleShortVersionString = "BOINC version 4.30";
-CFBundleGetInfoString = "BOINC version 4.30, Copyright 2005 University of California.";
+CFBundleShortVersionString = "BOINC version 4.35";
+CFBundleGetInfoString = "BOINC version 4.35, Copyright 2005 University of California.";

mac_build/boinc.pbproj/project.pbxproj

@@ -322,6 +322,7 @@
 				DD095F5807D883C000362260,
 				DD2D25CD07FAB41700151141,
 				DDEF38900802B73500E87552,
+				DD7E49CD080F9B09002716F9,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2131,6 +2132,12 @@
 			settings = {
 			};
 		};
+		DD7E49CD080F9B09002716F9 = {
+			fileRef = DD6D0A8507E9A61B007F882B;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		DD81C3D507C5CEB50098A04D = {
 			fileEncoding = 30;
 			isa = PBXFileReference;