commit f039e79d5438a8fc4a3ec11a387bbfc0f6b83024
author Behdad Esfahbod <behdad@behdad.org> Thu May 17 20:55:12 2012 -0400
committer Behdad Esfahbod <behdad@behdad.org> Thu May 17 20:55:12 2012 -0400
tree 9e5a48df4f5836a53f5414c22715e8846dc6dd36
parent 34961e3198e27fa37fd4cfdad12ef86a2e9e51c2

Don't use min/max as function names

They can be macros on some systems.  Eg. mingw32.

src/hb-set-private.hh

diff --git a/src/hb-set-private.hh b/src/hb-set-private.hh
index 3a7eb81..717e530 100644
--- a/src/hb-set-private.hh
+++ b/src/hb-set-private.hh
@@ -102,7 +102,7 @@
     for (unsigned int i = 0; i < ELTS; i++)
       elts[i] &= ~other->elts[i];
   }
-  inline hb_codepoint_t min (void) const
+  inline hb_codepoint_t get_min (void) const
   {
     for (unsigned int i = 0; i < ELTS; i++)
       if (elts[i])
@@ -111,7 +111,7 @@
 	    return i * BITS + j;
     return 0;
   }
-  inline hb_codepoint_t max (void) const
+  inline hb_codepoint_t get_max (void) const
   {
     for (unsigned int i = ELTS; i; i--)
       if (elts[i - 1])

src/hb-set.cc

diff --git a/src/hb-set.cc b/src/hb-set.cc
index 9d013a1..0e8adde 100644
--- a/src/hb-set.cc
+++ b/src/hb-set.cc
@@ -167,11 +167,11 @@
 hb_codepoint_t
 hb_set_min (hb_set_t *set)
 {
-  return set->min ();
+  return set->get_min ();
 }
 
 hb_codepoint_t
 hb_set_max (hb_set_t *set)
 {
-  return set->max ();
+  return set->get_max ();
 }