diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-09 18:32:51 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-09 18:32:51 +0300 |
| commit | ca3feba5c339f12141bf335e5592967caccc290b (patch) | |
| tree | 06ec4960d34fd7a50c6efb80f8e017b2f4ab5d99 /gui | |
| parent | 8ea134bd23022afbe1a06c0241c0c2c6ea2618f8 (diff) | |
| parent | 8760b0cb71dc6aa9c08d926712e64218931a1782 (diff) | |
| download | mpv-ca3feba5c339f12141bf335e5592967caccc290b.tar.bz2 mpv-ca3feba5c339f12141bf335e5592967caccc290b.tar.xz | |
Merge svn changes up to r27242
Conflicts:
Makefile
configure
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/mplayer/gui_common.c | 2 | ||||
| -rw-r--r-- | gui/mplayer/gui_common.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/gui/mplayer/gui_common.c b/gui/mplayer/gui_common.c index 3c3379fbb2..0bfeb9b805 100644 --- a/gui/mplayer/gui_common.c +++ b/gui/mplayer/gui_common.c @@ -50,7 +50,7 @@ extern unsigned int GetTimerMS( void ); -inline void TranslateFilename( int c,char * tmp,size_t tmplen ) +static inline void TranslateFilename( int c,char * tmp,size_t tmplen ) { int i; char * p; diff --git a/gui/mplayer/gui_common.h b/gui/mplayer/gui_common.h index fd5995eb14..f5791b02c5 100644 --- a/gui/mplayer/gui_common.h +++ b/gui/mplayer/gui_common.h @@ -29,7 +29,6 @@ #include "gui/bitmap.h" #include "gui/wm/ws.h" -extern inline void TranslateFilename( int c,char * tmp ); extern char * Translate( char * str ); extern void PutImage( txSample * bf,int x,int y,int max,int ofs ); extern void SimplePotmeterPutImage( txSample * bf,int x,int y,float frac ); |