commit 52195e705c10ab94c2b842591bbd2fda60e13102
author vchtchetkine <vchtchetkine@google.com> Mon Sep 21 12:21:29 2009 -0700
committer vchtchetkine <vchtchetkine@google.com> Mon Sep 21 12:21:29 2009 -0700
tree 3a8d89fa3b696e05698e71a5fcaf9344096e8d65
parent 9085a28c14f369d231dbae099a690689179f428a

Fix build break caused by undefined min(a,b)

android/charmap.c

diff --git a/android/charmap.c b/android/charmap.c
index 0ccd6dd..23f65fa 100644
--- a/android/charmap.c
+++ b/android/charmap.c
@@ -580,7 +580,10 @@
     }
 
     // Copy file name to charmap name.
-    to_copy = min(max_len - 1, ext_separator - file_name);
+    to_copy = ext_separator - file_name;
+    if (to_copy > (max_len - 1)) {
+        to_copy = max_len - 1;
+    }
     memcpy(charmap_name, file_name, to_copy);
     charmap_name[to_copy] = '\0';
 }