From f0ae670976a6790918544a1650b19c3f9f73dd92 Mon Sep 17 00:00:00 2001
From: Karl Chen <quarl@quarl.org>
Date: Sat, 14 Jun 2003 20:04:45 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=1438
---
 client/Makefile.am    |  1 -
 client/Makefile.in    |  9 ++++-----
 sched/validate_test.C | 22 ++++++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/Makefile.am b/client/Makefile.am
index 9d3ea2687b..ac91dd598a 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -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.* 
diff --git a/client/Makefile.in b/client/Makefile.in
index fe97855222..be06eaddde 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -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.* 
diff --git a/sched/validate_test.C b/sched/validate_test.C
index 3e178ac440..85c281ca4a 100644
--- a/sched/validate_test.C
+++ b/sched/validate_test.C
@@ -2,18 +2,18 @@
 // Version 1.0 (the "License"); you may not use this file except in
 // compliance with the License. You may obtain a copy of the License at
 // http://boinc.berkeley.edu/license_1.0.txt
-// 
+//
 // Software distributed under the License is distributed on an "AS IS"
 // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
 // License for the specific language governing rights and limitations
-// under the License. 
-// 
-// The Original Code is the Berkeley Open Infrastructure for Network Computing. 
-// 
+// under the License.
+//
+// The Original Code is the Berkeley Open Infrastructure for Network Computing.
+//
 // The Initial Developer of the Original Code is the SETI@home project.
 // Portions created by the SETI@home project are Copyright (C) 2002
-// University of California at Berkeley. All Rights Reserved. 
-// 
+// University of California at Berkeley. All Rights Reserved.
+//
 // Contributor(s):
 //
 
@@ -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;
         }
     }