diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
| commit | 8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch) | |
| tree | 7ad930ebc554ab68af1911f4dfd217cc18b86cce /loader/wrapper.h | |
| parent | 52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff) | |
| parent | 8c5889004f7ba9f6fcbca20a05a9301771348408 (diff) | |
| download | mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.bz2 mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.xz | |
Merge svn changes up to r28087
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
Diffstat (limited to 'loader/wrapper.h')
| -rw-r--r-- | loader/wrapper.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/loader/wrapper.h b/loader/wrapper.h index 2e8e3ac213..346f9e0e64 100644 --- a/loader/wrapper.h +++ b/loader/wrapper.h @@ -11,10 +11,10 @@ typedef int (*wrapper_func_t)(void *stack_base, int stack_size, reg386_t *reg, extern wrapper_func_t report_entry, report_ret; -extern void (*wrapper_target)(void); +void (*wrapper_target)(void); -extern int wrapper(void); -extern int null_call(void); +int wrapper(void); +int null_call(void); #endif /* MPLAYER_WRAPPER_H */ |