commit 6622e5dcf77fd1af7bdec45466da590471b53ba0
author Elliott Hughes <enh@google.com> Thu Jan 26 18:44:34 2012 -0800
committer Elliott Hughes <enh@google.com> Fri Jan 27 11:38:09 2012 -0800
tree 2c90f9c4965602d0e1037fbf2973fc8b926ad542
parent 748382f38dfe7a0d9a426a4b72fcfc399ba1a5da

Fix dlmalloc to compile without warnings on Mac OS.

Mac OS' GCC doesn't support #pragma GCC diagnostic.

Change-Id: I38a321a3dd1cad522a9e7475b58afac30c045aaf

src/dlmalloc.c

diff --git a/src/dlmalloc.c b/src/dlmalloc.c
index 931a44e..2429ccc 100644
--- a/src/dlmalloc.c
+++ b/src/dlmalloc.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 
 // Disable GCC diagnostics so that -Werror won't fail
-#pragma GCC diagnostic ignored "-Wsign-compare"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wempty-body"
 

src/dlmalloc/malloc.c

diff --git a/src/dlmalloc/malloc.c b/src/dlmalloc/malloc.c
index b0192ac..8fafd05 100644
--- a/src/dlmalloc/malloc.c
+++ b/src/dlmalloc/malloc.c
@@ -4263,8 +4263,10 @@
     sp = next;
   }
   /* Reset check counter */
-  m->release_checks = ((nsegs > MAX_RELEASE_CHECK_RATE)?
-                       nsegs : MAX_RELEASE_CHECK_RATE);
+  // BEGIN android-changed: signed/unsigned mismatches
+  m->release_checks = (((size_t) nsegs > (size_t) MAX_RELEASE_CHECK_RATE)?
+      (size_t) nsegs : (size_t) MAX_RELEASE_CHECK_RATE);
+  // END android-changed
   return released;
 }