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

Merge branch 'master' of git://boinc.berkeley.edu/boinc

This commit is contained in:
Oliver Bock 2013-03-05 13:35:06 +01:00
parent 9eece8663d 79c6225fc2
commit 899d2721ac
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/app.h
View File

@ -73,6 +73,7 @@ struct ACTIVE_TASK {
// START OF ITEMS SAVED IN STATE FILE
int _task_state;
// PROCESS_*; see common_defs.h
int slot;
// subdirectory of slots/ where this runs
double checkpoint_cpu_time;

3
configure.ac
View File

@ -853,6 +853,9 @@ if (test "$enable_xss" == yes) && (test "$have_Xss" == yes); then
SAH_CHECK_LIB([Xss],[XScreenSaverAllocInfo],[
AC_DEFINE([HAVE_XSS],[1],[Define to 1 if you have xss library])
CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
SAH_CHECK_LIB([X11],[XOpenDisplay],[
AC_DEFINE([HAVE_X11],[1],[Define to 1 if you have X11 library])
CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
fi

6
samples/condor/boinc_gahp.cpp
View File

@ -262,10 +262,6 @@ int parse_boinc_submit(COMMAND& c, char* p, SUBMIT_REQ& req) {
return 0;
}
int create_batch() {
}
int submit_jobs(SUBMIT_REQ req) {
return 0;
}
@ -283,7 +279,7 @@ void handle_boinc_submit(COMMAND& c, char* p) {
printf("error parsing request: %d\n", retval);
return;
}
retval = create_batch();
retval = create_batch(req);
if (retval) {
printf("error creating batch: %d\n", retval);
return;