diff options
| author | Eli Zaretskii | 2010-11-09 15:55:52 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-11-09 15:55:52 +0200 |
| commit | c00980655bc15ca019fd6c559c69601be18f2407 (patch) | |
| tree | 3a2347b3561e5ba827256bc1a2d834d56f3152ce /src | |
| parent | 14121c5280ed98bc16f401dbf0991277fb996b50 (diff) | |
| download | emacs-c00980655bc15ca019fd6c559c69601be18f2407.tar.gz emacs-c00980655bc15ca019fd6c559c69601be18f2407.zip | |
xfns.c (x_real_positions): Fix declaration-after-statement problem.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfns.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cba2b4b478d..c52c84961fa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-11-09 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xfns.c (x_real_positions): Fix declaration-after-statement | ||
| 4 | problem. | ||
| 5 | |||
| 1 | 2010-11-05 Chong Yidong <cyd@stupidchicken.com> | 6 | 2010-11-05 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * image.c (free_image): Don't garbage the frame here, since this | 8 | * image.c (free_image): Don't garbage the frame here, since this |
diff --git a/src/xfns.c b/src/xfns.c index b65323f199f..2e2bda49246 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -645,11 +645,10 @@ x_real_positions (f, xptr, yptr) | |||
| 645 | { | 645 | { |
| 646 | int ign; | 646 | int ign; |
| 647 | Window rootw; | 647 | Window rootw; |
| 648 | long *fe = (long *)tmp_data; | ||
| 648 | 649 | ||
| 649 | XGetGeometry (FRAME_X_DISPLAY (f), win, | 650 | XGetGeometry (FRAME_X_DISPLAY (f), win, |
| 650 | &rootw, &real_x, &real_y, &ign, &ign, &ign, &ign); | 651 | &rootw, &real_x, &real_y, &ign, &ign, &ign, &ign); |
| 651 | long *fe = (long *)tmp_data; | ||
| 652 | |||
| 653 | outer_x = -fe[0]; | 652 | outer_x = -fe[0]; |
| 654 | outer_y = -fe[2]; | 653 | outer_y = -fe[2]; |
| 655 | real_x -= fe[0]; | 654 | real_x -= fe[0]; |