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/win32.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/win32.h')
-rw-r--r-- | loader/win32.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/loader/win32.h b/loader/win32.h index 8f72352a6e..1e90827da0 100644 --- a/loader/win32.h +++ b/loader/win32.h @@ -21,7 +21,7 @@ #endif #endif -extern void my_garbagecollection(void); +void my_garbagecollection(void); typedef struct { UINT uDriverSignature; @@ -37,7 +37,7 @@ typedef DRVR *LPDRVR; typedef struct tls_s tls_t; -extern void* LookupExternal(const char* library, int ordinal); -extern void* LookupExternalByName(const char* library, const char* name); +void* LookupExternal(const char* library, int ordinal); +void* LookupExternalByName(const char* library, const char* name); #endif /* MPLAYER_WIN32_H */ |