aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorEli Zaretskii2012-10-08 14:21:04 +0200
committerEli Zaretskii2012-10-08 14:21:04 +0200
commitc54ebba4e076caeb6105c6bb682252b139a169fa (patch)
treee92d2e0b580c7bc62d12ac0002f9b110d17c542a /src/ChangeLog
parentb6f4e30044100e223954a31eb7753d024d6413f6 (diff)
downloademacs-c54ebba4e076caeb6105c6bb682252b139a169fa.tar.gz
emacs-c54ebba4e076caeb6105c6bb682252b139a169fa.zip
Update w32 dependencies in the wake of cygw32 changes.
src/makefile.w32-in (FONT_H): Add $(FRAME_H). (W32TERM_H): Add $(ATIMER_H) and $(FRAME_H). ($(BLD)/emacs.$(O), $(BLD)/w32console.$(O)): Update dependencies. (GLOBAL_SOURCES): Add cygw32.c. lib-src/makefile.w32-in (obj): Add cygw32.o.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7d2509b88cf..9e8377c2f7c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
12012-10-08 Eli Zaretskii <eliz@gnu.org> 12012-10-08 Eli Zaretskii <eliz@gnu.org>
2 2
3 * makefile.w32-in (FONT_H): Add $(FRAME_H).
4 (W32TERM_H): Add $(ATIMER_H) and $(FRAME_H).
5 ($(BLD)/emacs.$(O), $(BLD)/w32console.$(O)): Update dependencies.
6 (GLOBAL_SOURCES): Add cygw32.c.
7
3 * w32fns.c (w32_color_map_lookup, x_to_w32_color): Argument is now 8 * w32fns.c (w32_color_map_lookup, x_to_w32_color): Argument is now
4 'const char *'. 9 'const char *'.
5 (x_to_w32_color): Don't modify the argument, modify a copy instead. 10 (x_to_w32_color): Don't modify the argument, modify a copy instead.