applied 64bit patch from Ulrich Hecht <uli@suse.de>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6160 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 10 insertions, 10 deletions

diff --git a/Gui/mplayer/gtk/mb.c b/Gui/mplayer/gtk/mb.c
index 4594ea6d6b..ae53f112cf 100644
--- a/Gui/mplayer/gtk/mb.c
+++ b/Gui/mplayer/gtk/mb.c
@@ -41,7 +41,7 @@ GtkWidget * create_MessageBox( int type )
  GtkWidget * Ok;
  GtkAccelGroup * accel_group;
  GtkStyle * pixmapstyle;
- GtkPixmap * pixmapwid;
+ GdkPixmap * pixmapwid;
  GdkBitmap * mask;
 
  accel_group=gtk_accel_group_new();
diff --git a/Gui/mplayer/menu.h b/Gui/mplayer/menu.h
index edeff7f9e3..3e67e9c32f 100644
--- a/Gui/mplayer/menu.h
+++ b/Gui/mplayer/menu.h
@@ -9,8 +9,8 @@ void mplHideMenu( int mx,int my,int w );
 
 void mplMenuDraw( wsParamDisplay )
 {
- unsigned int * buf = NULL;
- unsigned int * drw = NULL;
+ uint32_t * buf = NULL;
+ uint32_t * drw = NULL;
  int             x,y,tmp;
 
  if ( !appMPlayer.menuBase.Bitmap.Image ) return;
@@ -22,8 +22,8 @@ void mplMenuDraw( wsParamDisplay )
 // ---
    if ( mplMenuItem != -1 )
     {
-     buf=(unsigned int *)mplMenuDrawBuffer;
-     drw=(unsigned int *)appMPlayer.menuSelected.Bitmap.Image;
+     buf=(uint32_t *)mplMenuDrawBuffer;
+     drw=(uint32_t *)appMPlayer.menuSelected.Bitmap.Image;
      for ( y=appMPlayer.MenuItems[ mplMenuItem ].y; y < appMPlayer.MenuItems[ mplMenuItem ].y + appMPlayer.MenuItems[ mplMenuItem ].height; y++ )
        for ( x=appMPlayer.MenuItems[ mplMenuItem ].x; x < appMPlayer.MenuItems[ mplMenuItem ].x + appMPlayer.MenuItems[ mplMenuItem ].width; x++ )
          {
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index f9541e3bbb..4c03eda50c 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -122,15 +122,15 @@ calclengthmmmmss:
 inline void PutImage( txSample * bf,int x,int y,int max,int ofs )
 {
  int i=0,ix,iy;
- unsigned int * buf = NULL;
- unsigned int * drw = NULL;
- unsigned int   tmp;
+ uint32_t * buf = NULL;
+ uint32_t * drw = NULL;
+ uint32_t   tmp;
 
  if ( ( !bf )||( bf->Image == NULL ) ) return;
 
  i=( bf->Width * ( bf->Height / max ) ) * ofs;
- buf=(unsigned int *)mplDrawBuffer;
- drw=(unsigned int *)bf->Image;
+ buf=(uint32_t *)mplDrawBuffer;
+ drw=(uint32_t *)bf->Image;
 
  for ( iy=y;iy < (int)(y+bf->Height / max);iy++ )
   for ( ix=x;ix < (int)(x+bf->Width);ix++ )