diff options
| author | Eli Zaretskii | 2010-11-22 20:09:29 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-11-22 20:09:29 +0200 |
| commit | b8e5cf1da0ef8f5e3cc37dd4276fe813f0305182 (patch) | |
| tree | 26cd612c45d00094f6d01c053e46d2f5d89b64aa /src/ChangeLog | |
| parent | 0c3b672775df3ba6f1f165e5565765a29ce5616d (diff) | |
| download | emacs-b8e5cf1da0ef8f5e3cc37dd4276fe813f0305182.tar.gz emacs-b8e5cf1da0ef8f5e3cc37dd4276fe813f0305182.zip | |
Back-port 2010-09-17T21:34:45Z!eliz@gnu.org from the trunk, to resolve bug #7452.
w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
of w32api >= 3.15.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0aa7e869c39..cc7e302d733 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-11-22 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions | ||
| 4 | of w32api >= 3.15. (Bug#6989) (Bug#7452) | ||
| 5 | |||
| 1 | 2010-11-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 6 | 2010-11-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 7 | ||
| 3 | * alloc.c (mark_terminals): Ensure that the image cache is marked | 8 | * alloc.c (mark_terminals): Ensure that the image cache is marked |