--- fvwm/menuitem.h	2003-06-29 20:53:23.000000000 +0100
+++ fvwm/menuitem.h	2004-04-20 11:33:37.525963472 +0100
@@ -125,7 +125,7 @@
 MenuItem *menuitem_create(void);
 void menuitem_free(MenuItem *mi);
 void menuitem_get_size(
-	MenuItem *mi, MenuItemPartSizesT *mips, FlocaleFont *font,
+	MenuItem *mi, MenuItemPartSizesT *mipst, FlocaleFont *font,
 	Bool do_reverse_icon_order);
 void menuitem_paint(
 	MenuItem *mi, MenuPaintItemParameters *mpip);
--- fvwm/menus.c	2004-01-06 14:05:01.000000000 +0000
+++ fvwm/menus.c	2004-04-20 11:33:37.562957848 +0100
@@ -1608,7 +1608,7 @@
 static void calculate_item_sizes(MenuSizingParameters *msp)
 {
 	MenuItem *mi;
-	MenuItemPartSizesT mips;
+	MenuItemPartSizesT mipst;
 	int i;
 	Bool do_reverse_icon_order =
 		(MST_USE_LEFT_SUBMENUS(msp->menu)) ? True : False;
@@ -1618,33 +1618,33 @@
 	for (mi = MR_FIRST_ITEM(msp->menu); mi != NULL; mi = MI_NEXT_ITEM(mi))
 	{
 		menuitem_get_size(
-			mi, &mips, MST_PSTDFONT(msp->menu),
+			mi, &mipst, MST_PSTDFONT(msp->menu),
 			do_reverse_icon_order);
 		/* adjust maximums */
-		if (msp->max.i.triangle_width < mips.triangle_width)
+		if (msp->max.i.triangle_width < mipst.triangle_width)
 		{
-			msp->max.i.triangle_width = mips.triangle_width;
+			msp->max.i.triangle_width = mipst.triangle_width;
 		}
-		if (msp->max.i.title_width < mips.title_width)
+		if (msp->max.i.title_width < mipst.title_width)
 		{
-			msp->max.i.title_width = mips.title_width;
+			msp->max.i.title_width = mipst.title_width;
 		}
 		for (i = 0; i < MAX_MENU_ITEM_LABELS; i++)
 		{
-			if (msp->max.i.label_width[i] < mips.label_width[i])
+			if (msp->max.i.label_width[i] < mipst.label_width[i])
 			{
-				msp->max.i.label_width[i] = mips.label_width[i];
+				msp->max.i.label_width[i] = mipst.label_width[i];
 			}
 		}
-		if (msp->max.i.picture_width < mips.picture_width)
+		if (msp->max.i.picture_width < mipst.picture_width)
 		{
-			msp->max.i.picture_width = mips.picture_width;
+			msp->max.i.picture_width = mipst.picture_width;
 		}
 		for (i = 0; i < MAX_MENU_ITEM_MINI_ICONS; i++)
 		{
-			if (msp->max.i.icon_width[i] < mips.icon_width[i])
+			if (msp->max.i.icon_width[i] < mipst.icon_width[i])
 			{
-				msp->max.i.icon_width[i] = mips.icon_width[i];
+				msp->max.i.icon_width[i] = mipst.icon_width[i];
 			}
 		}
 	}