diff --git a/api/boinc_api.h b/api/boinc_api.h index c9301e8b7c..d8aeef9c02 100755 --- a/api/boinc_api.h +++ b/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__ diff --git a/checkin_notes b/checkin_notes index 7b961de091..0d428f450d 100755 --- a/checkin_notes +++ b/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 diff --git a/mac_build/English.lproj/InfoPlist.strings b/mac_build/English.lproj/InfoPlist.strings index ffb16320f9..1c6af0c74a 100755 --- a/mac_build/English.lproj/InfoPlist.strings +++ b/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."; diff --git a/mac_build/Info.plist b/mac_build/Info.plist index 1e8ba40ccf..b0aeb96a5a 100644 --- a/mac_build/Info.plist +++ b/mac_build/Info.plist @@ -17,6 +17,6 @@ CFBundleSignature BNC! CFBundleVersion - 5.3.23 + 5.3.26 diff --git a/mac_build/Installer-Info.plist b/mac_build/Installer-Info.plist index ea27e90123..65c2cc030c 100644 --- a/mac_build/Installer-Info.plist +++ b/mac_build/Installer-Info.plist @@ -15,6 +15,6 @@ CFBundleSignature ???? CFBundleVersion - 5.3.23 + 5.3.26 diff --git a/mac_build/ScreenSaver-Info.plist b/mac_build/ScreenSaver-Info.plist index 8f39e376cf..73d0c565cf 100644 --- a/mac_build/ScreenSaver-Info.plist +++ b/mac_build/ScreenSaver-Info.plist @@ -17,7 +17,7 @@ CFBundleSignature ???? CFBundleVersion - 5.3.23 + 5.3.26 NSPrincipalClass BOINC_Saver_ModuleView diff --git a/mac_build/SystemMenu-Info.plist b/mac_build/SystemMenu-Info.plist index fa2cf7cfbe..3ae11aaca6 100644 --- a/mac_build/SystemMenu-Info.plist +++ b/mac_build/SystemMenu-Info.plist @@ -15,6 +15,6 @@ CFBundleSignature ???? CFBundleVersion - 5.3.23 + 5.3.26