From 0ed77df5c82be6ed0f97f399484f23ce462b9f53 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 7 Dec 2004 19:37:17 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=4780
---
 api/reduce.C  | 15 +++++++--------
 checkin_notes |  6 ++++++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/api/reduce.C b/api/reduce.C
index 38836f8a62..b181f13677 100644
--- a/api/reduce.C
+++ b/api/reduce.C
@@ -25,7 +25,6 @@ static volatile const char *BOINCrcsid="$Id$";
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-//#include "GL/gl.h"
 
 #include <cstring>
 #include <cstdio>
@@ -38,7 +37,7 @@ static volatile const char *BOINCrcsid="$Id$";
 #endif
 #endif
 
-#include "std_fixes.h"
+//#include "std_fixes.h"
 #include "boinc_gl.h"
 #include "gutil.h"
 #include "reduce.h"
@@ -133,18 +132,18 @@ void REDUCED_ARRAY::reduce_source_row(float* in, float* out) {
     for (i=0; i<sdimx; i++) {
         ri = (i*rdimx)/sdimx;
         switch (reduce_method) {
-            case REDUCE_METHOD_AVG:
+        case REDUCE_METHOD_AVG:
             out[ri] += in[i];
             itemp[ri]++;
             break;
-            case REDUCE_METHOD_SUM:
+        case REDUCE_METHOD_SUM:
             out[ri] += in[i];
             break;
-            case REDUCE_METHOD_MIN:
-            out[ri] = std::min(out[ri],in[i]);
+        case REDUCE_METHOD_MIN:
+            out[ri] = std::min(out[ri], in[i]);
             break;
-            case REDUCE_METHOD_MAX:
-            out[ri] = std::max(out[ri],in[i]);
+        case REDUCE_METHOD_MAX:
+            out[ri] = std::max(out[ri], in[i]);
             break;
         }
     }
diff --git a/checkin_notes b/checkin_notes
index c9749dbcad..6ffb4b8d32 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -20827,3 +20827,9 @@ Rom    7 Dec 2004
 
     api/
         reduce.C
+
+David  7 Dec 2004
+	- Win compile fix - don't include std_fixes (???)
+
+	api/
+		reduce.C