From 4c5014416d8785dce2148a98624490d07eed9e98 Mon Sep 17 00:00:00 2001 From: Bernd Machenschalk Date: Sun, 10 Jun 2012 13:44:01 +0000 Subject: [PATCH] - 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 --- api/boinc_api.h | 2 +- checkin_notes | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/api/boinc_api.h b/api/boinc_api.h index a3f87a61e7..ed7eaa5500 100644 --- a/api/boinc_api.h +++ b/api/boinc_api.h @@ -21,6 +21,7 @@ #ifdef _WIN32 #include "boinc_win.h" #endif +#include "app_ipc.h" // ANSI C API BEGINS HERE // Do not put implementation stuff here @@ -128,7 +129,6 @@ extern int setMacIcon(char *filename, char *iconData, long iconSize); #ifdef __cplusplus #include -#include "app_ipc.h" extern int boinc_get_init_data(APP_INIT_DATA&); extern int boinc_wu_cpu_time(double&); extern double boinc_elapsed_time(); diff --git a/checkin_notes b/checkin_notes index 8e7669c417..a702be53e1 100644 --- a/checkin_notes +++ b/checkin_notes @@ -4276,3 +4276,12 @@ David 9 June 2012 feeder.cpp credit_test.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