From: Jan Djärv Date: Sun, 29 Sep 2013 16:18:55 +0000 (+0200) Subject: * window.c (calc_absolute_offset): #elif should be #elif defined. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1428 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66d13b2080af9f35a789b01db07450101957c4f7;p=emacs.git * window.c (calc_absolute_offset): #elif should be #elif defined. --- 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 + * 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