diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-07-22 20:08:45 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-07-22 20:10:19 +0800 |
| commit | 1a8f315db5d40623aebec3808eb41db1ccc15b6b (patch) | |
| tree | fd847f94f568734939622c1ddf0c5da49d63b028 | |
| parent | 28ce96706f736691c43dd04ec308cf0f2595d351 (diff) | |
| download | gsoc2013-evolution-1a8f315db5d40623aebec3808eb41db1ccc15b6b.tar gsoc2013-evolution-1a8f315db5d40623aebec3808eb41db1ccc15b6b.tar.gz gsoc2013-evolution-1a8f315db5d40623aebec3808eb41db1ccc15b6b.tar.bz2 gsoc2013-evolution-1a8f315db5d40623aebec3808eb41db1ccc15b6b.tar.lz gsoc2013-evolution-1a8f315db5d40623aebec3808eb41db1ccc15b6b.tar.xz gsoc2013-evolution-1a8f315db5d40623aebec3808eb41db1ccc15b6b.tar.zst gsoc2013-evolution-1a8f315db5d40623aebec3808eb41db1ccc15b6b.zip | |
Bug 624525 - Variable name collision in gtk-compat macro
| -rw-r--r-- | e-util/gtk-compat.h | 10 | ||||
| -rw-r--r-- | libgnomecanvas/gailcanvas.c | 2 | ||||
| -rw-r--r-- | libgnomecanvas/gnome-canvas.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/e-util/gtk-compat.h b/e-util/gtk-compat.h index 3e531b2b1f..7dc61f3a84 100644 --- a/e-util/gtk-compat.h +++ b/e-util/gtk-compat.h @@ -53,15 +53,15 @@ #define gdk_region_get_rectangles(region, rectangles, n_rectangles) \ G_STMT_START { \ GdkRectangle *__rects; \ - gint __i, __n; \ + gint __i, __nrects; \ \ - __n = cairo_region_num_rectangles (region); \ - __rects = g_new (GdkRectangle, __n); \ + __nrects = cairo_region_num_rectangles (region); \ + __rects = g_new (GdkRectangle, __nrects); \ \ - for (__i = 0; __i < __n; __i++) \ + for (__i = 0; __i < __nrects; __i++) \ cairo_region_get_rectangle ((region), __i, &__rects[__i]); \ \ - *(n_rectangles) = __n; \ + *(n_rectangles) = __nrects; \ *(rectangles) = __rects; \ } G_STMT_END diff --git a/libgnomecanvas/gailcanvas.c b/libgnomecanvas/gailcanvas.c index fb64204a65..f88debc569 100644 --- a/libgnomecanvas/gailcanvas.c +++ b/libgnomecanvas/gailcanvas.c @@ -29,7 +29,7 @@ #include "gailcanvasitemfactory.h" #include "gailcanvaswidgetfactory.h" -#include <e-util/gtk-compat.h> +#include "e-util/gtk-compat.h" static void gail_canvas_class_init (GailCanvasClass *klass); static void gail_canvas_real_initialize (AtkObject *obj, diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c index 1ca6e5f32f..261a739e59 100644 --- a/libgnomecanvas/gnome-canvas.c +++ b/libgnomecanvas/gnome-canvas.c @@ -94,7 +94,7 @@ #include "gnome-canvas-marshal.h" #include "gnome-canvas-marshal.c" -#include <e-util/gtk-compat.h> +#include "e-util/gtk-compat.h" /* We must run our idle update handler *before* GDK wants to redraw. */ #define CANVAS_IDLE_PRIORITY (GDK_PRIORITY_REDRAW - 5) |