From: Ken Brown <kbrown@cornell.edu>
Date: Sun, 20 May 2012 12:19:13 +0000 (-0400)
Subject: Get rid of compiler warnings on Cygwin.
X-Git-Tag: emacs-24.2.90~471^2~6^2~110^2~47
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b170bc63c2f3a3fbe6ba6996d5a015e82634909;p=emacs.git

Get rid of compiler warnings on Cygwin.

* src/gmalloc.c (_free_internal_nolock, _realloc_internal_nolock)
[CYGWIN]:  Cast ptr to (char *) before comparing to _heapbase.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index de07e87e7b5..ea898893073 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-20  Ken Brown  <kbrown@cornell.edu>
+
+	* gmalloc.c (_free_internal_nolock, _realloc_internal_nolock)
+	[CYGWIN]:  Cast ptr to (char *) before comparing to _heapbase.
+
 2012-05-19  Ken Brown  <kbrown@cornell.edu>
 
 	* xfns.c (x_in_use): Remove `static' qualifier.
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 38406fd029a..b53199e7312 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -1004,7 +1004,7 @@ _free_internal_nolock (void *ptr)
     return;
 
 #ifdef CYGWIN
-  if (ptr < _heapbase)
+  if ((char *) ptr < _heapbase)
     /* We're being asked to free something in the static heap. */
     return;
 #endif
@@ -1341,7 +1341,7 @@ _realloc_internal_nolock (void *ptr, size_t size)
     return _malloc_internal_nolock (size);
 
 #ifdef CYGWIN
-  if (ptr < _heapbase)
+  if ((char *) ptr < _heapbase)
     /* ptr points into the static heap */
     return special_realloc (ptr, size);
 #endif