From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#7452: Duplicated Definitions Date: Mon, 22 Nov 2010 20:12:17 +0200 Message-ID: <8339qt9qim.fsf@gnu.org> References: <20101120.095055.01382203.Takaaki.Ota@am.sony.com> <83mxp3aj6b.fsf@gnu.org> <20101121.100956.04618562.Takaaki.Ota@am.sony.com> <83aal2a6dr.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1290451494 3939 80.91.229.12 (22 Nov 2010 18:44:54 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 22 Nov 2010 18:44:54 +0000 (UTC) To: Takaaki.Ota@am.sony.com, 7452-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Nov 22 19:44:49 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PKbNf-0001vY-NB for geb-bug-gnu-emacs@m.gmane.org; Mon, 22 Nov 2010 19:44:47 +0100 Original-Received: from localhost ([127.0.0.1]:51129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKbNf-0007Ir-4F for geb-bug-gnu-emacs@m.gmane.org; Mon, 22 Nov 2010 13:44:47 -0500 Original-Received: from [140.186.70.92] (port=40120 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKbNW-0007H2-7J for bug-gnu-emacs@gnu.org; Mon, 22 Nov 2010 13:44:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKbNR-0001gA-In for bug-gnu-emacs@gnu.org; Mon, 22 Nov 2010 13:44:38 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:60141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKbNR-0001g6-HP for bug-gnu-emacs@gnu.org; Mon, 22 Nov 2010 13:44:33 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PKaq3-0007wb-GW for bug-gnu-emacs@gnu.org; Mon, 22 Nov 2010 13:10:03 -0500 Resent-From: Eli Zaretskii Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Mon, 22 Nov 2010 18:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 7452 X-GNU-PR-Package: emacs,w32 X-GNU-PR-Keywords: Mail-Followup-To: 7452@debbugs.gnu.org, eliz@gnu.org Original-Received: via spool by 7452-done@debbugs.gnu.org id=D7452.129044934730508 (code D ref 7452); Mon, 22 Nov 2010 18:10:02 +0000 Original-Received: (at 7452-done) by debbugs.gnu.org; 22 Nov 2010 18:09:07 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PKap8-0007w0-Ii for submit@debbugs.gnu.org; Mon, 22 Nov 2010 13:09:07 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PKap5-0007ve-Mc for 7452-done@debbugs.gnu.org; Mon, 22 Nov 2010 13:09:05 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0LCA00C00RZBIJ00@a-mtaout23.012.net.il> for 7452-done@debbugs.gnu.org; Mon, 22 Nov 2010 20:14:17 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.124.52.47]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LCA00C88TBO1DF0@a-mtaout23.012.net.il>; Mon, 22 Nov 2010 20:14:17 +0200 (IST) In-reply-to: <83aal2a6dr.fsf@gnu.org> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Mon, 22 Nov 2010 13:10:03 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:41823 Archived-At: > Date: Sun, 21 Nov 2010 20:17:20 +0200 > From: Eli Zaretskii > Cc: 7452@debbugs.gnu.org > > > Date: Sun, 21 Nov 2010 10:09:56 -0800 > > CC: <7452@debbugs.gnu.org> > > From: Tak Ota > > > > Sorry I forgot to note. It is Emacs 23.2.90 pretest code. > > OK, thanks. > > > Do you still need the detail error message? > > No, I know how to fix this. Done. Patch below, if you want to try it right away. === modified file 'src/ChangeLog' --- src/ChangeLog 2010-09-17 15:47:49 +0000 +++ src/ChangeLog 2010-09-17 21:34:45 +0000 @@ -1,3 +1,8 @@ +2010-09-17 Eli Zaretskii + + * w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions + of w32api >= 3.15. (Bug#6989) (Bug#7452) + 2010-09-17 Lars Magne Ingebrigtsen * process.c (wait_reading_process_output): Don't message about === modified file 'src/w32.c' --- src/w32.c 2010-08-06 19:52:47 +0000 +++ src/w32.c 2010-09-17 21:34:45 +0000 @@ -94,8 +94,11 @@ typedef struct _MEMORY_STATUS_EX { #include #include +#include +#if !defined(__MINGW32__) || __W32API_MAJOR_VERSION < 3 || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 15) /* This either is not in psapi.h or guarded by higher value of - _WIN32_WINNT than what we use. */ + _WIN32_WINNT than what we use. w32api supplied with MinGW 3.15 + defines it in psapi.h */ typedef struct _PROCESS_MEMORY_COUNTERS_EX { DWORD cb; DWORD PageFaultCount; @@ -109,6 +112,7 @@ typedef struct _PROCESS_MEMORY_COUNTERS_ DWORD PeakPagefileUsage; DWORD PrivateUsage; } PROCESS_MEMORY_COUNTERS_EX,*PPROCESS_MEMORY_COUNTERS_EX; +#endif #ifdef HAVE_SOCKETS /* TCP connection support, if kernel can do it */ #include