From: Eli Zaretskii <eliz@gnu.org>
To: Takaaki.Ota@am.sony.com, 7452-done@debbugs.gnu.org
Subject: bug#7452: Duplicated Definitions
Date: Mon, 22 Nov 2010 20:12:17 +0200 [thread overview]
Message-ID: <8339qt9qim.fsf@gnu.org> (raw)
In-Reply-To: <83aal2a6dr.fsf@gnu.org>
> Date: Sun, 21 Nov 2010 20:17:20 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: 7452@debbugs.gnu.org
>
> > Date: Sun, 21 Nov 2010 10:09:56 -0800
> > CC: <7452@debbugs.gnu.org>
> > From: Tak Ota <Takaaki.Ota@am.sony.com>
> >
> > 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 <eliz@gnu.org>
+
+ * 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 <larsi@gnus.org>
* 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 <tlhelp32.h>
#include <psapi.h>
+#include <w32api.h>
+#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 <sys/socket.h>
prev parent reply other threads:[~2010-11-22 18:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-20 17:50 bug#7452: Duplicated Definitions Tak Ota
2010-11-20 19:28 ` Eli Zaretskii
2010-11-21 18:09 ` Tak Ota
2010-11-21 18:17 ` Eli Zaretskii
2010-11-22 18:12 ` Eli Zaretskii [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8339qt9qim.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=7452-done@debbugs.gnu.org \
--cc=Takaaki.Ota@am.sony.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.