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

diff --git a/src/ChangeLog b/src/ChangeLog
index bab050fbfbe1fffbec35bab7acfc41695d5712e8..784388e430446df9eb90a0db7cd66c1c75a7db80 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 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).
 

diff --git a/src/window.c b/src/window.c
index cca15122522c3c3a64ae241ba8513cad5f16dc31..967307038f4a7a47798bce1448666c24811acdf2 100644 (file)
--- 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