Picture -> FvwmPicture, to avoid collisions with xrandr includes.

As noticed by Tristan Le Guern.
okay matthieu@

2 files changed, 4 insertions, 4 deletions

diff --git a/app/fvwm/modules/FvwmButtons/FvwmButtons.c b/app/fvwm/modules/FvwmButtons/FvwmButtons.c
index cd170c7aa..11e02b4b2 100644
--- a/app/fvwm/modules/FvwmButtons/FvwmButtons.c
+++ b/app/fvwm/modules/FvwmButtons/FvwmButtons.c
@@ -1027,7 +1027,7 @@ void RedrawWindow(button_info *b)
 /**
 *** LoadIconFile()
 **/
-int LoadIconFile(char *s,Picture **p)
+int LoadIconFile(char *s,FvwmPicture **p)
 {
   *p=CachePicture(Dpy,Root,iconPath,pixmapPath,s, save_color_limit);
   if(*p)
diff --git a/app/fvwm/modules/FvwmButtons/FvwmButtons.h b/app/fvwm/modules/FvwmButtons/FvwmButtons.h
index 7cb4056a0..5d93d4cad 100644
--- a/app/fvwm/modules/FvwmButtons/FvwmButtons.h
+++ b/app/fvwm/modules/FvwmButtons/FvwmButtons.h
@@ -108,7 +108,7 @@ struct container_info_struct
   char *fore;              /* b_Fore */
   Pixel fc;                /* b_Fore */
   Pixel bc,hc,sc;          /* b_Back && !b_IconBack */
-  Picture *backicon;       /* b_Back && b_IconBack */
+  FvwmPicture *backicon;       /* b_Back && b_IconBack */
   ushort minx,miny;        /* b_Size */
 };
 
@@ -138,9 +138,9 @@ struct button_info_struct
   Window IconWin;          /* b_Icon || b_Swallow */
   Pixel fc;                /* b_Fore */
   Pixel bc,hc,sc;          /* b_Back && !b_IconBack */
-  Picture *backicon;       /* b_Back && b_IconBack */
+  FvwmPicture *backicon;       /* b_Back && b_IconBack */
   ushort minx,miny;        /* b_Size */
-  Picture *icon;           /* b_Icon */
+  FvwmPicture *icon;           /* b_Icon */
 
   byte swallow;            /* b_Swallow */
   byte swallow_mask;       /* b_Swallow */