From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daniel Colascione Newsgroups: gmane.emacs.devel Subject: [PATCH 1/4] Compilation cleanups Date: Thu, 29 Dec 2011 06:03:20 -0800 Message-ID: <0c9938df7c6041c406017cec0d16691d46d017f8.1325166472.git.dancol@dancol.org> References: NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1325167419 4908 80.91.229.12 (29 Dec 2011 14:03:39 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 29 Dec 2011 14:03:39 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 29 15:03:34 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RgGZw-0005qK-Ud for ged-emacs-devel@m.gmane.org; Thu, 29 Dec 2011 15:03:33 +0100 Original-Received: from localhost ([::1]:37278 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgGZv-0000sf-QB for ged-emacs-devel@m.gmane.org; Thu, 29 Dec 2011 09:03:31 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:49224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgGZs-0000sI-VK for emacs-devel@gnu.org; Thu, 29 Dec 2011 09:03:30 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RgGZr-0007T1-MZ for emacs-devel@gnu.org; Thu, 29 Dec 2011 09:03:28 -0500 Original-Received: from dancol.org ([96.126.100.184]:33784) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgGZr-0007Ro-GO for emacs-devel@gnu.org; Thu, 29 Dec 2011 09:03:27 -0500 Original-Received: from dancol by dancol.org with local (Exim 4.72) (envelope-from ) id 1RgGZk-0007mZ-UR for emacs-devel@gnu.org; Thu, 29 Dec 2011 06:03:20 -0800 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 96.126.100.184 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:146991 Archived-At: These fixes are necessary for compiling Emacs cleanly and without warnings. --- lib-src/update-game-score.c | 2 ++ src/gmalloc.c | 4 ++-- src/unexcw.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index e335617..5367f11 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c @@ -48,8 +48,10 @@ along with GNU Emacs. If not, see . */ #include /* Needed for SunOS4, for instance. */ +#if !defined(CYGWIN) extern char *optarg; extern int optind, opterr; +#endif // !defined(CYGWIN) static int usage (int err) NO_RETURN; diff --git a/src/gmalloc.c b/src/gmalloc.c index 7b5e6df..099a34b 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -1076,7 +1076,7 @@ _free_internal_nolock (ptr) return; #ifdef CYGWIN - if (ptr < _heapbase) + if ((char*)ptr < (char*)_heapbase) /* We're being asked to free something in the static heap. */ return; #endif @@ -1428,7 +1428,7 @@ _realloc_internal_nolock (ptr, size) return _malloc_internal_nolock (size); #ifdef CYGWIN - if (ptr < _heapbase) + if ((char*)ptr < (char*)_heapbase) /* ptr points into the static heap */ return special_realloc (ptr, size); #endif diff --git a/src/unexcw.c b/src/unexcw.c index 62df82e..0629420 100644 --- a/src/unexcw.c +++ b/src/unexcw.c @@ -31,6 +31,8 @@ along with GNU Emacs. If not, see . */ #define DOTEXE ".exe" +extern void report_sheap_usage (int); + extern int bss_sbrk_did_unexec; extern int __malloc_initialized; -- 1.7.5.1