Merge pull request #107 from JayXon/min

Avoid min name conflict
google · May 27, 2016 · 6818a08 · 6818a08
2 parents e0e937e + 56d968c
commit 6818a08
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/zopfli/squeeze.c b/src/zopfli/squeeze.c
@@ -197,7 +197,7 @@ static double GetCostModelMinCost(CostModelFun* costmodel, void* costcontext) {
   return costmodel(bestlength, bestdist, costcontext);
 }
 
-static size_t min(size_t a, size_t b) {
+static size_t zopfli_min(size_t a, size_t b) {
   return a < b ? a : b;
 }
 
@@ -283,7 +283,7 @@ static double GetBestLengths(ZopfliBlockState *s,
       }
     }
     /* Lengths. */
-    kend = min(leng, inend-i);
+    kend = zopfli_min(leng, inend-i);
     mincostaddcostj = mincost + costs[j];
     for (k = 3; k <= kend; k++) {
       double newCost;