* bug#7452: Duplicated Definitions
@ 2010-11-20 17:50 Tak Ota
2010-11-20 19:28 ` Eli Zaretskii
0 siblings, 1 reply; 5+ messages in thread
From: Tak Ota @ 2010-11-20 17:50 UTC (permalink / raw)
To: 7452
I had to remove the following definition in src/w32.c because it is
already defined in MinGW/include/psapi.h in the latest MinGW.
-Tak
/* This either is not in psapi.h or guarded by higher value of
_WIN32_WINNT than what we use. */
typedef struct _PROCESS_MEMORY_COUNTERS_EX {
DWORD cb;
DWORD PageFaultCount;
DWORD PeakWorkingSetSize;
DWORD WorkingSetSize;
DWORD QuotaPeakPagedPoolUsage;
DWORD QuotaPagedPoolUsage;
DWORD QuotaPeakNonPagedPoolUsage;
DWORD QuotaNonPagedPoolUsage;
DWORD PagefileUsage;
DWORD PeakPagefileUsage;
DWORD PrivateUsage;
} PROCESS_MEMORY_COUNTERS_EX,*PPROCESS_MEMORY_COUNTERS_EX;
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#7452: Duplicated Definitions
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
0 siblings, 1 reply; 5+ messages in thread
From: Eli Zaretskii @ 2010-11-20 19:28 UTC (permalink / raw)
To: Tak Ota; +Cc: 7452
> Date: Sat, 20 Nov 2010 09:50:55 -0800
> From: Tak Ota <Takaaki.Ota@am.sony.com>
> Cc:
>
> I had to remove the following definition in src/w32.c because it is
> already defined in MinGW/include/psapi.h in the latest MinGW.
Is this in Emacs 23.x or in Emacs 24? The latter already has the
solution for this, so if it doesn't work, please show the details (the
error messages and the version of your MinGW and w32api
installations).
If this is Emacs 23, then I will back-port the solution from Emacs 24
for the next release.
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#7452: Duplicated Definitions
2010-11-20 19:28 ` Eli Zaretskii
@ 2010-11-21 18:09 ` Tak Ota
2010-11-21 18:17 ` Eli Zaretskii
0 siblings, 1 reply; 5+ messages in thread
From: Tak Ota @ 2010-11-21 18:09 UTC (permalink / raw)
To: eliz; +Cc: 7452
Sorry I forgot to note. It is Emacs 23.2.90 pretest code. Do you
still need the detail error message?
-Tak
Sat, 20 Nov 2010 11:28:44 -0800: Eli Zaretskii <eliz@gnu.org> wrote:
> > Date: Sat, 20 Nov 2010 09:50:55 -0800
> > From: Tak Ota <Takaaki.Ota@am.sony.com>
> > Cc:
> >
> > I had to remove the following definition in src/w32.c because it is
> > already defined in MinGW/include/psapi.h in the latest MinGW.
>
> Is this in Emacs 23.x or in Emacs 24? The latter already has the
> solution for this, so if it doesn't work, please show the details (the
> error messages and the version of your MinGW and w32api
> installations).
>
> If this is Emacs 23, then I will back-port the solution from Emacs 24
> for the next release.
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#7452: Duplicated Definitions
2010-11-21 18:09 ` Tak Ota
@ 2010-11-21 18:17 ` Eli Zaretskii
2010-11-22 18:12 ` Eli Zaretskii
0 siblings, 1 reply; 5+ messages in thread
From: Eli Zaretskii @ 2010-11-21 18:17 UTC (permalink / raw)
To: Tak Ota; +Cc: 7452
> 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#7452: Duplicated Definitions
2010-11-21 18:17 ` Eli Zaretskii
@ 2010-11-22 18:12 ` Eli Zaretskii
0 siblings, 0 replies; 5+ messages in thread
From: Eli Zaretskii @ 2010-11-22 18:12 UTC (permalink / raw)
To: Takaaki.Ota, 7452-done
> 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>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-11-22 18:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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.