Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- API: fix for C-mode compilation of boinc_api.h 

moved app_ipc.h inclusion outside __cplusplus                                                                                                                                                                                  
        since it contains important C mode prototypes                                                                                                                                                                                  
        (boinc_resolve_filename() etc.)

svn path=/trunk/boinc/; revision=25752
This commit is contained in:
Bernd Machenschalk 2012-06-10 13:44:01 +00:00
parent 72ab18c0f8
commit 4c5014416d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/boinc_api.h
View File

@ -21,6 +21,7 @@
#ifdef _WIN32 #ifdef _WIN32
#include "boinc_win.h" #include "boinc_win.h"
#endif #endif
#include "app_ipc.h"
// ANSI C API BEGINS HERE // ANSI C API BEGINS HERE
// Do not put implementation stuff here // Do not put implementation stuff here
@ -128,7 +129,6 @@ extern int setMacIcon(char *filename, char *iconData, long iconSize);
#ifdef __cplusplus #ifdef __cplusplus
#include <string> #include <string>
#include "app_ipc.h"
extern int boinc_get_init_data(APP_INIT_DATA&); extern int boinc_get_init_data(APP_INIT_DATA&);
extern int boinc_wu_cpu_time(double&); extern int boinc_wu_cpu_time(double&);
extern double boinc_elapsed_time(); extern double boinc_elapsed_time();

9
checkin_notes
View File

@ -4276,3 +4276,12 @@ David 9 June 2012
feeder.cpp feeder.cpp
credit_test.cpp credit_test.cpp
sched_main.cpp sched_main.cpp
Bernd 10 Jun 2012
- API: fix for C-mode compilation of boinc_api.h
moved app_ipc.h inclusion outside __cplusplus
since it contains important C mode prototypes
(boinc_resolve_filename() etc.)
api/
boinc_api.h