procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jan Djärv 2013-09-29 18:18:55 +02:00
parent caa50be230
commit 66d13b2080
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -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).

2
src/window.c
View file

@ -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