aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam Steingold2011-01-19 10:55:47 -0500
committerSam Steingold2011-01-19 10:55:47 -0500
commit817a735de075cfdb0196eeee8c90435a7cacf13a (patch)
tree2e940137c657f9a8bd62a5f546d6e539949a6737 /src
parent4e55715e8a0dbad05de61d3e8568b58b08b06d05 (diff)
downloademacs-817a735de075cfdb0196eeee8c90435a7cacf13a.tar.gz
emacs-817a735de075cfdb0196eeee8c90435a7cacf13a.zip
Fix an error introduced by the previous patch.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/w32fns.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 99ab13d2995..5e50ddb59ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * w32.c (check_windows_init_file): Remove declarations of 3 * w32.c (check_windows_init_file): Remove declarations of
4 Vwindow_system, Vload_path, Qfile_exists_p to fix compilation. 4 Vwindow_system, Vload_path, Qfile_exists_p to fix compilation.
5 * w32fns.c: Fix an error introduced by the previous patch.
5 6
62011-01-19 Tom Tromey <tromey@redhat.com> 72011-01-19 Tom Tromey <tromey@redhat.com>
7 8
diff --git a/src/w32fns.c b/src/w32fns.c
index f70f4d6ace5..8508e3313aa 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -89,8 +89,6 @@ extern const char *const lispy_function_keys[];
89static unsigned hourglass_timer = 0; 89static unsigned hourglass_timer = 0;
90static HWND hourglass_hwnd = NULL; 90static HWND hourglass_hwnd = NULL;
91 91
92#if 0 #endif
93
94#ifndef IDC_HAND 92#ifndef IDC_HAND
95#define IDC_HAND MAKEINTRESOURCE(32649) 93#define IDC_HAND MAKEINTRESOURCE(32649)
96#endif 94#endif