diff --git a/ChangeLog b/ChangeLog
index 213db065b0..b4ac1d4119 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-14  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/gradient-flare/gradient-flare.c
+	(calc_sample_one_gradient): use G_STRUCT_OFFSET() instead of a
+	hand-made macro which caused a compiler warning (spotted by gymp,
+	bug #532853).
+
 2008-05-14  Michael Natterer  <mitch@gimp.org>
 
 	* app/widgets/gimpsessioninfo-book.[ch]: remove widget member from
diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c
index 45fa315589..1e32bd0220 100644
--- a/plug-ins/gradient-flare/gradient-flare.c
+++ b/plug-ins/gradient-flare/gradient-flare.c
@@ -59,7 +59,6 @@
 #endif
 
 #define LUMINOSITY(PIX) (GIMP_RGB_LUMINANCE (PIX[0], PIX[1], PIX[2]) + 0.5)
-#define OFFSETOF(t,f)   ((int) ((char*) &((t*) 0)->f))
 
 #define RESPONSE_RESCAN     1
 
@@ -1763,21 +1762,67 @@ calc_init_progress (void)
 static int
 calc_sample_one_gradient (void)
 {
-  static struct {
-    guchar      **values;
-    gint        name_offset;
-    gint        hue_offset;
-    gint        gray;
+  static struct
+  {
+    guchar **values;
+    gint     name_offset;
+    gint     hue_offset;
+    gint     gray;
   } table[] = {
-    { &calc.glow_radial, OFFSETOF (GFlare, glow_radial), OFFSETOF (GFlare, glow_hue), FALSE },
-    { &calc.glow_angular, OFFSETOF (GFlare, glow_angular), 0, FALSE },
-    { &calc.glow_angular_size, OFFSETOF (GFlare, glow_angular_size), 0, TRUE },
-    { &calc.rays_radial, OFFSETOF (GFlare, rays_radial), OFFSETOF (GFlare, rays_hue), FALSE },
-    { &calc.rays_angular, OFFSETOF (GFlare, rays_angular), 0, FALSE },
-    { &calc.rays_angular_size, OFFSETOF (GFlare, rays_angular_size), 0, TRUE },
-    { &calc.sflare_radial, OFFSETOF (GFlare, sflare_radial), OFFSETOF (GFlare, sflare_hue), FALSE },
-    { &calc.sflare_sizefac, OFFSETOF (GFlare, sflare_sizefac), 0, TRUE },
-    { &calc.sflare_probability, OFFSETOF (GFlare, sflare_probability), 0, TRUE },
+    {
+      &calc.glow_radial,
+      G_STRUCT_OFFSET (GFlare, glow_radial),
+      G_STRUCT_OFFSET (GFlare, glow_hue),
+      FALSE
+    },
+    {
+      &calc.glow_angular,
+      G_STRUCT_OFFSET (GFlare, glow_angular),
+      0,
+      FALSE
+    },
+    {
+      &calc.glow_angular_size,
+      G_STRUCT_OFFSET (GFlare, glow_angular_size),
+      0,
+      TRUE
+    },
+    {
+      &calc.rays_radial,
+      G_STRUCT_OFFSET (GFlare, rays_radial),
+      G_STRUCT_OFFSET (GFlare, rays_hue),
+      FALSE
+    },
+    {
+      &calc.rays_angular,
+      G_STRUCT_OFFSET (GFlare, rays_angular),
+      0,
+      FALSE
+    },
+    {
+      &calc.rays_angular_size,
+      G_STRUCT_OFFSET (GFlare, rays_angular_size),
+      0,
+      TRUE
+    },
+    {
+      &calc.sflare_radial,
+      G_STRUCT_OFFSET (GFlare, sflare_radial),
+      G_STRUCT_OFFSET (GFlare, sflare_hue),
+      FALSE
+    },
+    {
+      &calc.sflare_sizefac,
+      G_STRUCT_OFFSET (GFlare, sflare_sizefac),
+      0,
+      TRUE
+    },
+    {
+      &calc.sflare_probability,
+      G_STRUCT_OFFSET (GFlare, sflare_probability),
+      0,
+      TRUE
+    }
   };
   GFlare        *gflare = calc.gflare;
   GradientName  *grad_name;