Get rid of pointless 'extern' keywords.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2

13 files changed, 74 insertions, 74 deletions

diff --git a/loader/dmo/DMO_AudioDecoder.c b/loader/dmo/DMO_AudioDecoder.c
index 0b83d48f4c..033133c6fc 100644
--- a/loader/dmo/DMO_AudioDecoder.c
+++ b/loader/dmo/DMO_AudioDecoder.c
@@ -31,7 +31,7 @@ struct DMO_AudioDecoder
 #include "mp_msg.h"
 
 typedef long STDCALL (*GETCLASS) (GUID*, GUID*, void**);
-extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);
+void print_wave_header(WAVEFORMATEX *h, int verbose_level);
 
 DMO_AudioDecoder * DMO_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf,int out_channels)
 //DMO_AudioDecoder * DMO_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf)
diff --git a/loader/elfdll.c b/loader/elfdll.c
index 7636871f94..fe71cbd911 100644
--- a/loader/elfdll.c
+++ b/loader/elfdll.c
@@ -33,8 +33,8 @@ extern modref_list* local_wm;
 
 
 /*------------------ HACKS -----------------*/
-extern DWORD fixup_imports(WINE_MODREF *wm);
-extern void dump_exports(HMODULE hModule);
+DWORD fixup_imports(WINE_MODREF *wm);
+void dump_exports(HMODULE hModule);
 /*---------------- END HACKS ---------------*/
 
 //char *extra_ld_library_path = "/usr/lib/win32";
diff --git a/loader/ext.h b/loader/ext.h
index 17cbf64f57..dbe54ee1c1 100644
--- a/loader/ext.h
+++ b/loader/ext.h
@@ -8,12 +8,12 @@
 
 #include "wine/windef.h"
 
-extern LPVOID FILE_dommap( int unix_handle, LPVOID start,
-			   DWORD size_high, DWORD size_low,
-			   DWORD offset_high, DWORD offset_low,
-			   int prot, int flags );
-extern int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low );
-extern int wcsnicmp(const unsigned short* s1, const unsigned short* s2, int n);
-extern int __vprintf( const char *format, ... );
+LPVOID FILE_dommap( int unix_handle, LPVOID start,
+                    DWORD size_high, DWORD size_low,
+                    DWORD offset_high, DWORD offset_low,
+                    int prot, int flags );
+int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low );
+int wcsnicmp( const unsigned short* s1, const unsigned short* s2, int n );
+int __vprintf( const char *format, ... );
 
 #endif /* MPLAYER_EXT_H */
diff --git a/loader/registry.c b/loader/registry.c
index b17f734d13..50912aa4dd 100644
--- a/loader/registry.c
+++ b/loader/registry.c
@@ -24,7 +24,7 @@
 //#undef TRACE
 //#define TRACE printf
 
-extern char *get_path ( const char * );
+char *get_path(const char*);
 
 // ...can be set before init_registry() call
 char* regpathname = NULL;
diff --git a/loader/win32.c b/loader/win32.c
index 576e3bd945..96ab76f691 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -1159,7 +1159,7 @@ static HANDLE WINAPI expHeapCreate(long flags, long init_size, long max_size)
 // we will silently ignore this second call...
 static void* heapfreehack = 0;
 static int heapfreehackshown = 0;
-//extern void trapbug(void);
+//void trapbug(void);
 static void* WINAPI expHeapAlloc(HANDLE heap, int flags, int size)
 {
     void* z;
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 */
diff --git a/loader/wine/debugtools.h b/loader/wine/debugtools.h
index d9eab67902..aaefdb7dd6 100644
--- a/loader/wine/debugtools.h
+++ b/loader/wine/debugtools.h
@@ -37,17 +37,17 @@ enum DEBUG_CLASS { DBCL_FIXME, DBCL_ERR, DBCL_WARN, DBCL_TRACE, DBCL_COUNT };
 /* These function return a printable version of a string, including
    quotes.  The string will be valid for some time, but not indefinitely
    as strings are re-used.  */
-extern LPCSTR debugstr_an (LPCSTR s, int n);
-extern LPCSTR debugstr_wn (LPCWSTR s, int n);
-extern LPCSTR debugres_a (LPCSTR res);
-extern LPCSTR debugres_w (LPCWSTR res);
-extern LPCSTR debugstr_guid( const struct GUID *id );
-extern LPCSTR debugstr_hex_dump (const void *ptr, int len);
-extern int dbg_header_err( const char *dbg_channel, const char *func );
-extern int dbg_header_warn( const char *dbg_channel, const char *func );
-extern int dbg_header_fixme( const char *dbg_channel, const char *func );
-extern int dbg_header_trace( const char *dbg_channel, const char *func );
-extern int dbg_vprintf( const char *format, va_list args );
+LPCSTR debugstr_an( LPCSTR s, int n );
+LPCSTR debugstr_wn( LPCWSTR s, int n );
+LPCSTR debugres_a( LPCSTR res );
+LPCSTR debugres_w( LPCWSTR res );
+LPCSTR debugstr_guid( const struct GUID *id );
+LPCSTR debugstr_hex_dump( const void *ptr, int len );
+int dbg_header_err( const char *dbg_channel, const char *func );
+int dbg_header_warn( const char *dbg_channel, const char *func );
+int dbg_header_fixme( const char *dbg_channel, const char *func );
+int dbg_header_trace( const char *dbg_channel, const char *func );
+int dbg_vprintf( const char *format, va_list args );
 
 static inline LPCSTR debugstr_a( LPCSTR s )  { return debugstr_an( s, 80 ); }
 static inline LPCSTR debugstr_w( LPCWSTR s ) { return debugstr_wn( s, 80 ); }
diff --git a/loader/wine/heap.h b/loader/wine/heap.h
index 592bf8259c..477f0e1acc 100644
--- a/loader/wine/heap.h
+++ b/loader/wine/heap.h
@@ -14,12 +14,12 @@
 extern HANDLE SystemHeap;
 extern HANDLE SegptrHeap;
 
-extern int HEAP_IsInsideHeap( HANDLE heap, DWORD flags, LPCVOID ptr );
-extern SEGPTR HEAP_GetSegptr( HANDLE heap, DWORD flags, LPCVOID ptr );
-extern LPSTR HEAP_strdupA( HANDLE heap, DWORD flags, LPCSTR str );
-extern LPWSTR HEAP_strdupW( HANDLE heap, DWORD flags, LPCWSTR str );
-extern LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str );
-extern LPSTR HEAP_strdupWtoA( HANDLE heap, DWORD flags, LPCWSTR str );
+int HEAP_IsInsideHeap( HANDLE heap, DWORD flags, LPCVOID ptr );
+SEGPTR HEAP_GetSegptr( HANDLE heap, DWORD flags, LPCVOID ptr );
+LPSTR HEAP_strdupA( HANDLE heap, DWORD flags, LPCSTR str );
+LPWSTR HEAP_strdupW( HANDLE heap, DWORD flags, LPCWSTR str );
+LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str );
+LPSTR HEAP_strdupWtoA( HANDLE heap, DWORD flags, LPCWSTR str );
 
 /* SEGPTR helper macros */
 
diff --git a/loader/wine/ldt.h b/loader/wine/ldt.h
index 89d2a6b692..fb4c5351ff 100644
--- a/loader/wine/ldt.h
+++ b/loader/wine/ldt.h
@@ -30,11 +30,11 @@ typedef struct
 extern "C" 
 {
 #endif
-extern void LDT_BytesToEntry( const unsigned long *buffer, ldt_entry *content);
-extern void LDT_EntryToBytes( unsigned long *buffer, const ldt_entry *content);
-extern int LDT_GetEntry( int entry, ldt_entry *content );
-extern int LDT_SetEntry( int entry, const ldt_entry *content );
-extern void LDT_Print( int start, int length );
+void LDT_BytesToEntry( const unsigned long *buffer, ldt_entry *content );
+void LDT_EntryToBytes( unsigned long *buffer, const ldt_entry *content );
+int LDT_GetEntry( int entry, ldt_entry *content );
+int LDT_SetEntry( int entry, const ldt_entry *content );
+void LDT_Print( int start, int length );
 
 
   /* This structure is used to build the local copy of the LDT. */
diff --git a/loader/wine/module.h b/loader/wine/module.h
index 0642f4bd5c..cba53f61a1 100644
--- a/loader/wine/module.h
+++ b/loader/wine/module.h
@@ -139,11 +139,11 @@ typedef struct modref_list_t
 
 
 /* module.c */
-extern FARPROC MODULE_GetProcAddress( HMODULE hModule, LPCSTR function, WIN_BOOL snoop );
-extern WINE_MODREF *MODULE32_LookupHMODULE( HMODULE hModule );
-extern WINE_MODREF *MODULE_FindModule( LPCSTR path );
+FARPROC MODULE_GetProcAddress( HMODULE hModule, LPCSTR function, WIN_BOOL snoop );
+WINE_MODREF *MODULE32_LookupHMODULE( HMODULE hModule );
+WINE_MODREF *MODULE_FindModule( LPCSTR path );
 
 /* resource.c */
-extern INT       WINAPI AccessResource(HMODULE,HRSRC); 
+INT WINAPI AccessResource( HMODULE, HRSRC );
 
 #endif /* MPLAYER_MODULE_H */
diff --git a/loader/wine/pe_image.h b/loader/wine/pe_image.h
index 6f3ac6b498..1c28bc12d0 100644
--- a/loader/wine/pe_image.h
+++ b/loader/wine/pe_image.h
@@ -25,32 +25,32 @@ typedef struct {
 } PE_MODREF;
 
 struct wine_modref;
-extern int PE_unloadImage(HMODULE hModule);
-extern FARPROC PE_FindExportedFunction(struct wine_modref *wm, LPCSTR funcName, WIN_BOOL snoop);
-extern WIN_BOOL PE_EnumResourceTypesA(HMODULE,ENUMRESTYPEPROCA,LONG);
-extern WIN_BOOL PE_EnumResourceTypesW(HMODULE,ENUMRESTYPEPROCW,LONG);
-extern WIN_BOOL PE_EnumResourceNamesA(HMODULE,LPCSTR,ENUMRESNAMEPROCA,LONG);
-extern WIN_BOOL PE_EnumResourceNamesW(HMODULE,LPCWSTR,ENUMRESNAMEPROCW,LONG);
-extern WIN_BOOL PE_EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROCA,LONG);
-extern WIN_BOOL PE_EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG);
-extern HRSRC PE_FindResourceExW(struct wine_modref*, LPCWSTR, LPCWSTR, WORD);
-extern DWORD PE_SizeofResource(HMODULE,HRSRC);
-extern struct wine_modref *PE_LoadLibraryExA(LPCSTR, DWORD);
-extern void PE_UnloadLibrary(struct wine_modref *);
-extern HGLOBAL PE_LoadResource(struct wine_modref *wm, HRSRC);
-extern HMODULE PE_LoadImage( int hFile, LPCSTR filename, WORD *version );
-extern struct wine_modref *PE_CreateModule( HMODULE hModule, LPCSTR filename,
-                                             DWORD flags, WIN_BOOL builtin );
-extern WIN_BOOL PE_CreateProcess( HANDLE hFile, LPCSTR filename, LPCSTR cmd_line, LPCSTR env, 
-                              LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
-                              WIN_BOOL inherit, DWORD flags, LPSTARTUPINFOA startup,
-                              LPPROCESS_INFORMATION info );
+int PE_unloadImage(HMODULE hModule);
+FARPROC PE_FindExportedFunction(struct wine_modref *wm, LPCSTR funcName, WIN_BOOL snoop);
+WIN_BOOL PE_EnumResourceTypesA(HMODULE, ENUMRESTYPEPROCA, LONG);
+WIN_BOOL PE_EnumResourceTypesW(HMODULE, ENUMRESTYPEPROCW, LONG);
+WIN_BOOL PE_EnumResourceNamesA(HMODULE, LPCSTR, ENUMRESNAMEPROCA, LONG);
+WIN_BOOL PE_EnumResourceNamesW(HMODULE, LPCWSTR, ENUMRESNAMEPROCW, LONG);
+WIN_BOOL PE_EnumResourceLanguagesA(HMODULE, LPCSTR, LPCSTR, ENUMRESLANGPROCA, LONG);
+WIN_BOOL PE_EnumResourceLanguagesW(HMODULE, LPCWSTR, LPCWSTR, ENUMRESLANGPROCW, LONG);
+HRSRC PE_FindResourceExW(struct wine_modref*, LPCWSTR, LPCWSTR, WORD);
+DWORD PE_SizeofResource(HMODULE, HRSRC);
+struct wine_modref *PE_LoadLibraryExA(LPCSTR, DWORD);
+void PE_UnloadLibrary(struct wine_modref *);
+HGLOBAL PE_LoadResource(struct wine_modref *wm, HRSRC);
+HMODULE PE_LoadImage(int hFile, LPCSTR filename, WORD *version);
+struct wine_modref *PE_CreateModule(HMODULE hModule, LPCSTR filename,
+                                    DWORD flags, WIN_BOOL builtin);
+WIN_BOOL PE_CreateProcess(HANDLE hFile, LPCSTR filename, LPCSTR cmd_line, LPCSTR env,
+                          LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
+                          WIN_BOOL inherit, DWORD flags, LPSTARTUPINFOA startup,
+                          LPPROCESS_INFORMATION info);
 
-extern void PE_InitTls(void);
-extern WIN_BOOL PE_InitDLL(struct wine_modref *wm, DWORD type, LPVOID lpReserved);
+void PE_InitTls(void);
+WIN_BOOL PE_InitDLL(struct wine_modref *wm, DWORD type, LPVOID lpReserved);
 
-extern PIMAGE_RESOURCE_DIRECTORY GetResDirEntryA(PIMAGE_RESOURCE_DIRECTORY,LPCSTR,DWORD,WIN_BOOL);
-extern PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY,LPCWSTR,DWORD,WIN_BOOL);
+PIMAGE_RESOURCE_DIRECTORY GetResDirEntryA(PIMAGE_RESOURCE_DIRECTORY, LPCSTR, DWORD, WIN_BOOL);
+PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY, LPCWSTR, DWORD, WIN_BOOL);
 
 typedef DWORD CALLBACK (*DLLENTRYPROC)(HMODULE,DWORD,LPVOID);
 
@@ -74,8 +74,8 @@ typedef struct {
 	ELF_STDCALL_STUB	*stubs;
 } ELF_MODREF;
 
-extern struct wine_modref *ELF_LoadLibraryExA( LPCSTR libname, DWORD flags);
-extern void ELF_UnloadLibrary(struct wine_modref *);
-extern FARPROC ELF_FindExportedFunction(struct wine_modref *wm, LPCSTR funcName);
+struct wine_modref *ELF_LoadLibraryExA( LPCSTR libname, DWORD flags);
+void ELF_UnloadLibrary(struct wine_modref *);
+FARPROC ELF_FindExportedFunction(struct wine_modref *wm, LPCSTR funcName);
 
 #endif /* MPLAYER_PE_IMAGE_H */
diff --git a/loader/wine/winnt.h b/loader/wine/winnt.h
index 19594e71b1..dd0f0b05c5 100644
--- a/loader/wine/winnt.h
+++ b/loader/wine/winnt.h
@@ -1071,15 +1071,15 @@ typedef struct NT_TIB
 struct TEB;
 /*
 #if defined(__i386__) && defined(__GNUC__)
-extern inline struct TEB * WINAPI NtCurrentTeb(void);
-extern inline struct TEB * WINAPI NtCurrentTeb(void)
+inline struct TEB * WINAPI NtCurrentTeb(void);
+inline struct TEB * WINAPI NtCurrentTeb(void)
 {
     struct TEB *teb;
     __asm__(".byte 0x64\n\tmovl (0x18),%0" : "=r" (teb));
     return teb;
 }
 #else
-extern struct TEB * WINAPI NtCurrentTeb(void);
+struct TEB * WINAPI NtCurrentTeb(void);
 #endif
 */
 
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 */