[Emacs-diffs] trunk r114481: * window.c (calc_absolute_offset): #elif should be #elif defined.

[Jan D.]

------------------------------------------------------------
revno: 114481
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2013-09-29 18:18:55 +0200
message:
  * window.c (calc_absolute_offset): #elif should be #elif defined.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-29 10:21:58 +0000
+++ b/src/ChangeLog     2013-09-29 16:18:55 +0000
@@ -1,5 +1,7 @@
 2013-09-29  Jan Djärv  <address@hidden>
 
+       * window.c (calc_absolute_offset): #elif should be #elif defined.
+
        * frame.c (delete_frame): Block/unblock input to overcome race
        condition (Bug#15475).
 

=== modified file 'src/window.c'
--- a/src/window.c      2013-09-24 06:43:20 +0000
+++ b/src/window.c      2013-09-29 16:18:55 +0000
@@ -945,7 +945,7 @@
 #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