*** empty log message ***

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

api/boinc_api.h

@@ -30,7 +30,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-struct BOINC_OPTIONS {
+typedef struct BOINC_OPTIONS {
     int main_program;
         // this is the main program, so
         // - lock a lock file in the slot directory
@@ -55,15 +55,15 @@ struct BOINC_OPTIONS {
 	    // up, such as threads and memory.  So terminate the app
 	    // and use a checkpoint to recover from the issue during
 	    // the next execution.
-};
+} BOINC_OPTIONS;
 
-struct BOINC_STATUS {
+typedef struct BOINC_STATUS {
     int no_heartbeat;
     int suspended;
     int quit_request;
     int reread_init_data_file;
     int abort_request;
-};
+} BOINC_STATUS;
 
 extern int boinc_init(void);
 extern int boinc_finish(int status);
@@ -88,10 +88,8 @@ extern int boinc_is_standalone(void);
 extern void boinc_ops_per_cpu_sec(double fp, double integer);
 extern void boinc_ops_cumulative(double fp, double integer);
 extern int boinc_receive_trickle_down(char* buf, int len);
-#ifndef __OBJC__
 extern int boinc_init_options(BOINC_OPTIONS*);
 extern int boinc_get_status(BOINC_STATUS*);
-#endif
 extern double boinc_get_fraction_done();
 
 #ifdef __APPLE__

checkin_notes

@@ -2842,7 +2842,7 @@ Charlie  14 Mar 2006
     - Fix compiler bug due to BOINC_OPTIONS* when using objective-C.
 
     api/
-        boinc_api.C,h
+        boinc_api.h
 
 Rom    14 Mar 2006
     - Bug Fix: Copy over the account manager url from the rpc to
@@ -2871,3 +2871,11 @@ David  15 Mar 2006
         acct_mgr.C
     html/user/
         am_set_info.php
+
+Charlie  16 Mar 2006
+    - Add typedef to BOINC_OPTIONS and BOINC_STATUS so boinc_get_status() 
+        and boinc_init_options() declarations compile without errors 
+        when using straight C and objective-C with GCC-4.0.
+
+    api/
+        boinc_api.h

mac_build/English.lproj/InfoPlist.strings

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

mac_build/Info.plist

@@ -17,6 +17,6 @@
 	<key>CFBundleSignature</key>
 	<string>BNC!</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.23</string>
+	<string>5.3.26</string>
 </dict>
 </plist>

mac_build/Installer-Info.plist

@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.23</string>
+	<string>5.3.26</string>
 </dict>
 </plist>

mac_build/ScreenSaver-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.23</string>
+	<string>5.3.26</string>
 	<key>NSPrincipalClass</key>
 	<string>BOINC_Saver_ModuleView</string>
 </dict>

mac_build/SystemMenu-Info.plist

@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.23</string>
+	<string>5.3.26</string>
 </dict>
 </plist>