* window.c (calc_absolute_offset): #elif should be #elif defined.

66d13b20 · Jan Djärv · caa50be2 · 66d13b20 · 66d13b20
Commit 66d13b20 authored Sep 29, 2013 by Jan Djärv
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

src/ChangeLog src/ChangeLog +2 -0

src/window.c src/window.c +1 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 2013-09-29  Jan Djärv  <jan.h.d@swipnet.se>

+	* window.c (calc_absolute_offset): #elif should be #elif defined.
+
 	* frame.c (delete_frame): Block/unblock input to overcome race
 	condition (Bug#15475).


--- a/src/window.c
+++ b/src/window.c
@@ -945,7 +945,7 @@ calc_absolute_offset (struct window *w, int *add_x, int *add_y)
 #endif
 #ifdef FRAME_TOOLBAR_TOP_HEIGHT
  *add_y += FRAME_TOOLBAR_TOP_HEIGHT (f);
-#elif FRAME_TOOLBAR_HEIGHT
+#elif defined (FRAME_TOOLBAR_HEIGHT)
  *add_y += FRAME_TOOLBAR_HEIGHT (f);
 #endif
 #ifdef FRAME_NS_TITLEBAR_HEIGHT