diff options
| author | Bastien Nocera <hadess@users.sourceforge.net> | 2004-07-11 11:47:10 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@users.sourceforge.net> | 2004-07-11 11:47:10 +0000 |
| commit | d2d3a03835c3f1fbfd414d8626af2291680be85c (patch) | |
| tree | ad093553bf70d6e6870fd40a99503139441e636b /src/dxr3/dxr3_scr.c | |
| parent | 80d77b640625fc857782efd897b24ccda5890da4 (diff) | |
| download | xine-lib-d2d3a03835c3f1fbfd414d8626af2291680be85c.tar.gz xine-lib-d2d3a03835c3f1fbfd414d8626af2291680be85c.tar.bz2 | |
- Fix build with inline functions on GCC 3.4.0
dxr3_scr.c: In function `dxr3_scr_set_speed':
dxr3_scr.c:52: sorry, unimplemented: inlining failed in call to 'dxr3_mvcommand': function body not available
dxr3_scr.c:220: sorry, unimplemented: called from here
CVS patchset: 6788
CVS date: 2004/07/11 11:47:10
Diffstat (limited to 'src/dxr3/dxr3_scr.c')
| -rw-r--r-- | src/dxr3/dxr3_scr.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/dxr3/dxr3_scr.c b/src/dxr3/dxr3_scr.c index 5c9ca39cc..8a9cf1613 100644 --- a/src/dxr3/dxr3_scr.c +++ b/src/dxr3/dxr3_scr.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_scr.c,v 1.14 2004/04/10 15:29:57 mroi Exp $ + * $Id: dxr3_scr.c,v 1.15 2004/07/11 11:47:10 hadess Exp $ */ /* dxr3 scr plugin. @@ -48,12 +48,19 @@ static void dxr3_scr_adjust(scr_plugin_t *scr, int64_t vpts); static int dxr3_scr_set_speed(scr_plugin_t *scr, int speed); static void dxr3_scr_exit(scr_plugin_t *scr); -/* helper function */ -static inline int dxr3_mvcommand(int fd_control, int command); - /* config callback */ static void dxr3_scr_update_priority(void *this_gen, xine_cfg_entry_t *entry); +static inline int dxr3_mvcommand(int fd_control, int command) +{ + em8300_register_t reg; + + reg.microcode_register = 1; + reg.reg = 0; + reg.val = command; + + return ioctl(fd_control, EM8300_IOCTL_WRITEREG, ®); +} dxr3_scr_t *dxr3_scr_init(xine_t *xine) { @@ -246,16 +253,7 @@ static void dxr3_scr_exit(scr_plugin_t *scr) } -static inline int dxr3_mvcommand(int fd_control, int command) -{ - em8300_register_t reg; - - reg.microcode_register = 1; - reg.reg = 0; - reg.val = command; - - return ioctl(fd_control, EM8300_IOCTL_WRITEREG, ®); -} + static void dxr3_scr_update_priority(void *this_gen, xine_cfg_entry_t *entry) { |