diff options
| author | Jens Granseuer <jensgr@gmx.net> | 2008-02-26 20:47:29 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-02-26 20:47:29 +0000 |
| commit | 401b716cf5143fa69603c1b20f95f3745b1046ed (patch) | |
| tree | 1e22c4cd071fc8aedf8f980bef58924a911ec7d3 | |
| parent | 3d4adc8be92b226592aaa3064b064c4f47047ecf (diff) | |
| download | metacity-401b716cf5143fa69603c1b20f95f3745b1046ed.tar.gz metacity-401b716cf5143fa69603c1b20f95f3745b1046ed.tar.bz2 | |
reorder declarations so we don't break C89 compilers. Closes #518917.
2008-02-26 Jens Granseuer <jensgr@gmx.net>
* src/core/constraints.c (constrain_aspect_ratio,
constrain_size_limits, constrain_size_increments):
reorder declarations so we don't break C89 compilers.
Closes #518917.
svn path=/trunk/; revision=3605
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/core/constraints.c | 6 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2008-02-26 Jens Granseuer <jensgr@gmx.net> + + * src/core/constraints.c (constrain_aspect_ratio, + constrain_size_limits, constrain_size_increments): + reorder declarations so we don't break C89 compilers. + Closes #518917. + 2008-02-26 Thomas Thurman <tthurman@gnome.org> * configure.in: Post-release bump to 2.23.1. diff --git a/src/core/constraints.c b/src/core/constraints.c index e081347..c11d390 100644 --- a/src/core/constraints.c +++ b/src/core/constraints.c @@ -811,6 +811,7 @@ constrain_size_increments (MetaWindow *window, int bh, hi, bw, wi, extra_height, extra_width; int new_width, new_height; gboolean constraint_already_satisfied; + MetaRectangle *start_rect; if (priority > PRIORITY_SIZE_HINTS_INCREMENTS) return TRUE; @@ -855,7 +856,6 @@ constrain_size_increments (MetaWindow *window, /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity * See bug 448183 */ - MetaRectangle *start_rect; if (info->action_type == ACTION_MOVE_AND_RESIZE) start_rect = &info->current; else @@ -879,6 +879,7 @@ constrain_size_limits (MetaWindow *window, MetaRectangle min_size, max_size; gboolean too_big, too_small, constraint_already_satisfied; int new_width, new_height; + MetaRectangle *start_rect; if (priority > PRIORITY_SIZE_HINTS_LIMITS) return TRUE; @@ -911,7 +912,6 @@ constrain_size_limits (MetaWindow *window, /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity * See bug 448183 */ - MetaRectangle *start_rect; if (info->action_type == ACTION_MOVE_AND_RESIZE) start_rect = &info->current; else @@ -936,6 +936,7 @@ constrain_aspect_ratio (MetaWindow *window, int fudge, new_width, new_height; double best_width, best_height; double alt_width, alt_height; + MetaRectangle *start_rect; if (priority > PRIORITY_ASPECT_RATIO) return TRUE; @@ -1044,7 +1045,6 @@ constrain_aspect_ratio (MetaWindow *window, /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity * See bug 448183 */ - MetaRectangle *start_rect; if (info->action_type == ACTION_MOVE_AND_RESIZE) start_rect = &info->current; else |