diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:03:14 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:03:14 +0200 |
commit | 36e7a20e695b376287310d602b44d6719f82a021 (patch) | |
tree | 75070d702043e875c947fccaa2de7a419331de22 /loader/wine | |
parent | 70fb003a9f2d9dc764e320f3ca64b0af1c68fdfb (diff) | |
parent | 93abb4f09229730c30e5bbdd6c54d4b981995eee (diff) | |
download | mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.bz2 mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.xz |
Merge svn changes up to r30550
Diffstat (limited to 'loader/wine')
-rw-r--r-- | loader/wine/basetsd.h | 8 | ||||
-rw-r--r-- | loader/wine/ldt.h | 7 | ||||
-rw-r--r-- | loader/wine/msacm.h | 8 | ||||
-rw-r--r-- | loader/wine/ntdef.h | 8 | ||||
-rw-r--r-- | loader/wine/vfw.h | 7 | ||||
-rw-r--r-- | loader/wine/winbase.h | 8 | ||||
-rw-r--r-- | loader/wine/windef.h | 16 | ||||
-rw-r--r-- | loader/wine/windows.h | 8 | ||||
-rw-r--r-- | loader/wine/winreg.h | 8 | ||||
-rw-r--r-- | loader/wine/winuser.h | 8 |
10 files changed, 0 insertions, 86 deletions
diff --git a/loader/wine/basetsd.h b/loader/wine/basetsd.h index 7a13d58dba..0ec90a9aeb 100644 --- a/loader/wine/basetsd.h +++ b/loader/wine/basetsd.h @@ -13,10 +13,6 @@ #include "config.h" -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - /* * Win32 was easy to implement under Unix since most (all?) 32-bit * Unices uses the same type model (ILP32) as Win32, where int, long @@ -165,8 +161,4 @@ typedef __uint32 DWORD_PTR, *PDWORD_PTR; typedef INT_PTR SSIZE_T, *PSSIZE_T; typedef UINT_PTR SIZE_T, *PSIZE_T; -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - #endif /* MPLAYER_BASETSD_H */ diff --git a/loader/wine/ldt.h b/loader/wine/ldt.h index e3f511b062..e607085f33 100644 --- a/loader/wine/ldt.h +++ b/loader/wine/ldt.h @@ -26,10 +26,6 @@ typedef struct int limit_in_pages; /* is the limit in pages or bytes? */ enum seg_type type; /* segment type */ } ldt_entry; -#ifdef __cplusplus -extern "C" -{ -#endif 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 ); @@ -92,8 +88,5 @@ extern unsigned char ldt_flags_copy[LDT_SIZE]; (!((sel) & 4) || (SELECTOR_TO_ENTRY(sel) < FIRST_LDT_ENTRY_TO_ALLOC)) #define IS_SELECTOR_32BIT(sel) \ (IS_SELECTOR_SYSTEM(sel) || (GET_SEL_FLAGS(sel) & LDT_FLAGS_32BIT)) -#ifdef __cplusplus -} -#endif #endif /* MPLAYER_LDT_H */ diff --git a/loader/wine/msacm.h b/loader/wine/msacm.h index 6a0be7c068..b8b24383c6 100644 --- a/loader/wine/msacm.h +++ b/loader/wine/msacm.h @@ -9,10 +9,6 @@ #include "driver.h" #include "mmreg.h" -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - //typedef WORD VERSION; /* major (high byte), minor (low byte) */ typedef UINT16 MMVERSION16; @@ -934,8 +930,4 @@ MMRESULT WINAPI acmStreamUnprepareHeader( HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare ); -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - #endif /* MPLAYER_MSACM_H */ diff --git a/loader/wine/ntdef.h b/loader/wine/ntdef.h index 9e68828bbf..c7061a4c1d 100644 --- a/loader/wine/ntdef.h +++ b/loader/wine/ntdef.h @@ -6,10 +6,6 @@ #include "pshpack1.h" -#ifdef __cplusplus -extern "C" { -#endif - #define NTAPI __stdcall #ifndef IN @@ -92,10 +88,6 @@ typedef OBJECT_ATTRIBUTES *POBJECT_ATTRIBUTES; } -#ifdef __cplusplus -} -#endif - #include "poppack.h" #endif /* MPLAYER_NTDEF_H */ diff --git a/loader/wine/vfw.h b/loader/wine/vfw.h index 1cf94b5ac7..7bf72be42d 100644 --- a/loader/wine/vfw.h +++ b/loader/wine/vfw.h @@ -6,10 +6,6 @@ #ifndef MPLAYER_VFW_H #define MPLAYER_VFW_H //#include "pshpack1.h" -#ifdef __cplusplus -extern "C" { -#endif - #include "windef.h" typedef struct __attribute__((__packed__)) @@ -667,7 +663,4 @@ typedef struct { #define AVIERR_USERABORT MAKE_AVIERR(198) #define AVIERR_ERROR MAKE_AVIERR(199) -#ifdef __cplusplus -} -#endif #endif /* MPLAYER_VFW_H */ diff --git a/loader/wine/winbase.h b/loader/wine/winbase.h index b7ae733553..a8fe81ee3f 100644 --- a/loader/wine/winbase.h +++ b/loader/wine/winbase.h @@ -7,10 +7,6 @@ #include "pshpack1.h" -#ifdef __cplusplus -extern "C" { -#endif - typedef struct tagCOORD { INT16 x; INT16 y; @@ -1778,8 +1774,4 @@ VOID WINAPI SetLastError(DWORD); #define GetCurrentProcess() ((HANDLE)0xffffffff) #define GetCurrentThread() ((HANDLE)0xfffffffe) -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_WINBASE_H */ diff --git a/loader/wine/windef.h b/loader/wine/windef.h index ddf0228dd0..b46607969b 100644 --- a/loader/wine/windef.h +++ b/loader/wine/windef.h @@ -13,14 +13,6 @@ # include "config.h" -#ifdef _EGCS_ -#define __stdcall -#endif - -#ifdef __cplusplus -extern "C" { -#endif - /* Misc. constants. */ #ifdef FALSE @@ -91,11 +83,9 @@ extern "C" { #ifdef __i386__ # if defined(__GNUC__) && ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7))) -# ifndef _EGCS_ #define __stdcall __attribute__((__stdcall__)) #define __cdecl __attribute__((__cdecl__)) # define RESTORE_ES __asm__ volatile("pushl %ds\n\tpopl %es") -# endif # else // # error You need gcc >= 2.7 to build Wine on a 386 # endif @@ -460,11 +450,9 @@ typedef LRESULT CALLBACK (*WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM); /* Macro for structure packing. */ #ifdef __GNUC__ -#ifndef _EGCS_ #define WINE_PACKED __attribute__((packed)) #define WINE_UNUSED __attribute__((unused)) #define WINE_NORETURN __attribute__((noreturn)) -#endif #else #define WINE_PACKED /* nothing */ #define WINE_UNUSED /* nothing */ @@ -633,8 +621,4 @@ typedef const RECTL *LPCRECTL; ((r16)->left = (INT16)(r32)->left, (r16)->top = (INT16)(r32)->top, \ (r16)->right = (INT16)(r32)->right, (r16)->bottom = (INT16)(r32)->bottom) -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_WINDEF_H */ diff --git a/loader/wine/windows.h b/loader/wine/windows.h index 505110d4b9..1443bb32b1 100644 --- a/loader/wine/windows.h +++ b/loader/wine/windows.h @@ -1,10 +1,6 @@ #ifndef MPLAYER_WINDOWS_H #define MPLAYER_WINDOWS_H -#ifdef __cplusplus -extern "C" { -#endif - #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -31,8 +27,4 @@ typedef KANJISTRUCT *PKANJISTRUCT; #endif /* 0 */ -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_WINDOWS_H */ diff --git a/loader/wine/winreg.h b/loader/wine/winreg.h index ede64c0fd5..f01c42fcca 100644 --- a/loader/wine/winreg.h +++ b/loader/wine/winreg.h @@ -7,10 +7,6 @@ #include "winbase.h" #include "winnt.h" -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - /* #define SHELL_ERROR_SUCCESS 0L #define SHELL_ERROR_BADDB 1L @@ -50,8 +46,4 @@ typedef struct value_entW { typedef ACCESS_MASK REGSAM; -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - #endif /* MPLAYER_WINREG_H */ diff --git a/loader/wine/winuser.h b/loader/wine/winuser.h index cda96c4f23..ec451d748e 100644 --- a/loader/wine/winuser.h +++ b/loader/wine/winuser.h @@ -5,10 +5,6 @@ #include <stdarg.h> #endif -#ifdef __cplusplus -extern "C" { -#endif - #include "windef.h" #include "pshpack1.h" @@ -2923,8 +2919,4 @@ VOID WINAPI ScreenSwitchEnable16(WORD); #define WC_DIALOG (LPSTR)((DWORD)((WORD)( 0x8002))) -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_WINUSER_H */ |