mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=1438
This commit is contained in:
parent
4decb0f33f
commit
f0ae670976
|
@ -72,7 +72,6 @@ win/win_config.h: $(top_srcdir)/config.h
|
|||
EXTRA_DIST = \
|
||||
*.h \
|
||||
mac/*.h mac/*.cpp \
|
||||
win/*.h.in \
|
||||
win/*.h win/*.cpp win/*.rc \
|
||||
win/*.ico win/*.def win/res/*.* \
|
||||
translation/language.*
|
||||
|
|
|
@ -137,12 +137,12 @@ target_cpu = @target_cpu@
|
|||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
|
||||
MYSQL_INCLUDES = /usr/local/mysql/include
|
||||
MYSQL_INCLUDES2 = /usr/local/mysql/include/mysql
|
||||
MYSQL_INCLUDES3 = /usr/include/mysql
|
||||
MYSQL_INCLUDES = /usr/local/mysql_32bit/include
|
||||
MYSQL_INCLUDES2 = /usr/local/mysql_32bit/include/mysql
|
||||
MYSQL_INCLUDES3 = /usr/include/mysql_32bit
|
||||
|
||||
MYSQL_LIBS = \
|
||||
-L/usr/local/mysql/lib -L/sw/lib/mysql -L/usr/local/lib/mysql \
|
||||
-L/usr/local/mysql_32bit/lib -L/sw/lib/mysql -L/usr/local/lib/mysql \
|
||||
-lmysqlclient -L/usr/local/lib -lz \
|
||||
-lm $(NETLIBS)
|
||||
|
||||
|
@ -224,7 +224,6 @@ speed_stats_CFLAGS = -O6 $(AM_CFLAGS)
|
|||
EXTRA_DIST = \
|
||||
*.h \
|
||||
mac/*.h mac/*.cpp \
|
||||
win/*.h.in \
|
||||
win/*.h win/*.cpp win/*.rc \
|
||||
win/*.ico win/*.def win/res/*.* \
|
||||
translation/language.*
|
||||
|
|
|
@ -55,18 +55,20 @@ int check_set(vector<RESULT>& results, int& canonicalid, double& credit) {
|
|||
// read the result files into malloc'd memory buffers
|
||||
//
|
||||
for (i=0; i<n; i++) {
|
||||
retval = get_output_file_path(results[i], path);
|
||||
RESULT& result = results[i];
|
||||
retval = get_output_file_path(result, path);
|
||||
if (retval) {
|
||||
log_messages.printf(
|
||||
SchedMessages::CRITICAL,
|
||||
"check_set: can't get output filename for %s\n",
|
||||
results[i].name
|
||||
result.name
|
||||
);
|
||||
return retval;
|
||||
}
|
||||
retval = read_file_malloc(path, files[i]);
|
||||
if (retval) {
|
||||
log_messages.printf(SchedMessages::CRITICAL, "read_file_malloc %s %d\n", path, retval);
|
||||
log_messages.printf(SchedMessages::CRITICAL, "[RESULT#%d %s] Couldn't open %s (read_file_malloc()=%d)\n",
|
||||
result.id, result.name, path, retval);
|
||||
return retval;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue