diff options
| author | Eli Zaretskii | 2012-09-01 12:29:17 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-09-01 12:29:17 +0300 |
| commit | 4dfbd23866adef6886771b80a464decc9e95e7c5 (patch) | |
| tree | f006663ce0fd599115dfe678c8ddfecc715b27e7 /src/ChangeLog | |
| parent | 86571ae075b3fedc4b7312738fe99af9b7991f69 (diff) | |
| download | emacs-4dfbd23866adef6886771b80a464decc9e95e7c5.tar.gz emacs-4dfbd23866adef6886771b80a464decc9e95e7c5.zip | |
Fix last changes related to w32 and Cygwin.
src/image.c: Restore mistakenly removed inclusion of w32.h. Without
it, GCC doesn't see prototypes of w32_delayed_load, and complains
about implicit conversions from integer to pointer.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cfa60cbcf66..56e45503ad0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-09-01 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * image.c: Restore mistakenly removed inclusion of w32.h. Without | ||
| 4 | it, GCC doesn't see prototypes of w32_delayed_load, and complains | ||
| 5 | about implicit conversions from integer to pointer. | ||
| 6 | |||
| 1 | 2012-09-01 Daniel Colascione <dancol@dancol.org> | 7 | 2012-09-01 Daniel Colascione <dancol@dancol.org> |
| 2 | 8 | ||
| 3 | * w32fns.c (x_display_info_for_name): Prevent crash if w32 window | 9 | * w32fns.c (x_display_info_for_name): Prevent crash if w32 window |