aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2013-09-29 18:18:55 +0200
committerJan Djärv2013-09-29 18:18:55 +0200
commit66d13b2080af9f35a789b01db07450101957c4f7 (patch)
treeb139713841a565c6fe1f4743d121663ff4afcef4 /src
parentcaa50be230ca9313be276a7a48bba2417ed3e573 (diff)
downloademacs-66d13b2080af9f35a789b01db07450101957c4f7.tar.gz
emacs-66d13b2080af9f35a789b01db07450101957c4f7.zip
* window.c (calc_absolute_offset): #elif should be #elif defined.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/window.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bab050fbfbe..784388e4304 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12013-09-29 Jan Djärv <jan.h.d@swipnet.se> 12013-09-29 Jan Djärv <jan.h.d@swipnet.se>
2 2
3 * window.c (calc_absolute_offset): #elif should be #elif defined.
4
3 * frame.c (delete_frame): Block/unblock input to overcome race 5 * frame.c (delete_frame): Block/unblock input to overcome race
4 condition (Bug#15475). 6 condition (Bug#15475).
5 7
diff --git a/src/window.c b/src/window.c
index cca15122522..967307038f4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -945,7 +945,7 @@ calc_absolute_offset (struct window *w, int *add_x, int *add_y)
945#endif 945#endif
946#ifdef FRAME_TOOLBAR_TOP_HEIGHT 946#ifdef FRAME_TOOLBAR_TOP_HEIGHT
947 *add_y += FRAME_TOOLBAR_TOP_HEIGHT (f); 947 *add_y += FRAME_TOOLBAR_TOP_HEIGHT (f);
948#elif FRAME_TOOLBAR_HEIGHT 948#elif defined (FRAME_TOOLBAR_HEIGHT)
949 *add_y += FRAME_TOOLBAR_HEIGHT (f); 949 *add_y += FRAME_TOOLBAR_HEIGHT (f);
950#endif 950#endif
951#ifdef FRAME_NS_TITLEBAR_HEIGHT 951#ifdef FRAME_NS_TITLEBAR_HEIGHT