diff options
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/window.c | 2 |
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 @@ 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 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) #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 |