Userland symbols are not supposed to start with __, reserved for

system/compiler usage. ok pvalchev@

x11/mplayer/patches/patch-Gui_skin_skin_c

@@ -0,0 +1,164 @@
+$OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
+--- Gui/skin/skin.c.orig	Wed May 15 17:57:43 2002
++++ Gui/skin/skin.c	Wed May 15 17:57:47 2002
+@@ -76,7 +76,7 @@ int skinBPRead( char * fname, txSample *
+  return i;
+ }
+ 
+-int __section( char * in )
++int skin__section( char * in )
+ {
+  strlower( in );
+  defList=NULL;
+@@ -85,7 +85,7 @@ int __section( char * in )
+  return 0;
+ }
+ 
+-int __end( char * in )
++int skin__end( char * in )
+ {
+  if ( strlen( winList ) ) winList[0]=0;
+   else defList=NULL;
+@@ -93,7 +93,7 @@ int __end( char * in )
+  return 0;
+ }
+ 
+-int __window( char * in )
++int skin__window( char * in )
+ {
+  CHECKDEFLIST( "window" );
+ 
+@@ -103,7 +103,7 @@ int __window( char * in )
+  return 0;
+ }
+ 
+-int __base( char * in )
++int skin__base( char * in )
+ {
+  unsigned char fname[512];
+  unsigned char tmp[512];
+@@ -187,7 +187,7 @@ int __base( char * in )
+  return 0;
+ }
+ 
+-int __background( char * in )
++int skin__background( char * in )
+ {
+  CHECKDEFLIST( "background" );
+  CHECKWINLIST( "background" );
+@@ -202,7 +202,7 @@ int __background( char * in )
+  return 0;
+ }
+ 
+-int __button( char * in )
++int skin__button( char * in )
+ {
+  unsigned char   fname[512];
+  unsigned char   tmp[512];
+@@ -245,7 +245,7 @@ int __button( char * in )
+  return 0;
+ }
+ 
+-int __selected( char * in )
++int skin__selected( char * in )
+ {
+  unsigned char   fname[512];
+  unsigned char   tmp[512];
+@@ -264,7 +264,7 @@ int __selected( char * in )
+  return 0;
+ }
+ 
+-int __menu( char * in )
++int skin__menu( char * in )
+ { // menu = number,x,y,sx,sy,msg
+  int             x,y,sx,sy,msg;
+  unsigned char   tmp[64];
+@@ -296,7 +296,7 @@ int __menu( char * in )
+  return 0;
+ }
+ 
+-int __hpotmeter( char * in )
++int skin__hpotmeter( char * in )
+ { // hpotmeter=buttonbitmaps,sx,sy,phasebitmaps,phases,default value,x,y,sx,sy,msg
+  int             x,y,psx,psy,ph,sx,sy,msg,d;
+  unsigned char   tmp[512];
+@@ -353,7 +353,7 @@ int __hpotmeter( char * in )
+  return 0;
+ }
+ 
+-int __potmeter( char * in )
++int skin__potmeter( char * in )
+ { // potmeter=phasebitmaps,phases,default value,x,y,sx,sy,msg
+  int             x,y,ph,sx,sy,msg,d;
+  unsigned char   tmp[512];
+@@ -396,7 +396,7 @@ int __potmeter( char * in )
+  return 0;
+ }
+ 
+-int __font( char * in )
++int skin__font( char * in )
+ { // font=fontname,fontid
+  char    name[512];
+  char    id[512];
+@@ -432,7 +432,7 @@ int __font( char * in )
+  return 0;
+ }
+ 
+-int __slabel( char * in )
++int skin__slabel( char * in )
+ {
+  char    tmp[512];
+  char    sid[63];
+@@ -466,7 +466,7 @@ int __slabel( char * in )
+  return 0;
+ }
+ 
+-int __dlabel( char * in )
++int skin__dlabel( char * in )
+ { // dlabel=x,y,sx,align,fontid,string ...
+  char    tmp[512];
+  char    sid[63];
+@@ -502,7 +502,7 @@ int __dlabel( char * in )
+  return 0;
+ }
+ 
+-int __decoration( char * in )
++int skin__decoration( char * in )
+ {
+  char    tmp[512];
+ 
+@@ -527,20 +527,20 @@ typedef struct
+ 
+ _item skinItem[] =
+  {
+-  { "section",     __section     },
+-  { "end",         __end         },
+-  { "window",      __window      },
+-  { "base",        __base        },
+-  { "button",      __button      },
+-  { "selected",    __selected    },
+-  { "background",  __background  },
+-  { "hpotmeter",   __hpotmeter   },
+-  { "potmeter",    __potmeter    },
+-  { "font",        __font        },
+-  { "slabel",      __slabel      },
+-  { "dlabel",      __dlabel      },
+-  { "decoration",  __decoration  },
+-  { "menu",        __menu        }
++  { "section",     skin__section     },
++  { "end",         skin__end         },
++  { "window",      skin__window      },
++  { "base",        skin__base        },
++  { "button",      skin__button      },
++  { "selected",    skin__selected    },
++  { "background",  skin__background  },
++  { "hpotmeter",   skin__hpotmeter   },
++  { "potmeter",    skin__potmeter    },
++  { "font",        skin__font        },
++  { "slabel",      skin__slabel      },
++  { "dlabel",      skin__dlabel      },
++  { "decoration",  skin__decoration  },
++  { "menu",        skin__menu        }
+  };
+ 
+ #define ITEMS (int)( sizeof( skinItem )/sizeof( _item ) )