diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-16 18:57:23 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-16 19:14:44 +0100 |
| commit | 6de8120822c2dd9c50ef23b4977421651396f1ae (patch) | |
| tree | 11a977608cfc9f50cffbce4a879dd8e9b33b029c /loader/wine/windef.h | |
| parent | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (diff) | |
| parent | a8168102668337f3c11619bea7e744fc245adff1 (diff) | |
| download | mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.bz2 mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
command.c
mp_core.h
mplayer.c
screenshot.c
Diffstat (limited to 'loader/wine/windef.h')
| -rw-r--r-- | loader/wine/windef.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/loader/wine/windef.h b/loader/wine/windef.h index b46607969b..ee455dc3f8 100644 --- a/loader/wine/windef.h +++ b/loader/wine/windef.h @@ -47,6 +47,8 @@ # define NONAMELESSUNION #endif /* !defined(NONAMELESSUNION) */ +#if 0 + #ifndef NONAMELESSSTRUCT #define DUMMYSTRUCTNAME #define DUMMYSTRUCTNAME1 @@ -79,6 +81,8 @@ #define DUMMYUNIONNAME5 u5 #endif /* !defined(NONAMELESSUNION) */ +#endif + /* Calling conventions definitions */ #ifdef __i386__ @@ -301,8 +305,8 @@ typedef LRESULT CALLBACK (*DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM); typedef INT CALLBACK (*EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT); typedef INT CALLBACK (*EDITWORDBREAKPROCW)(LPWSTR,INT,INT,INT); DECL_WINELIB_TYPE_AW(EDITWORDBREAKPROC) -typedef LRESULT CALLBACK (*FARPROC)(); -typedef INT CALLBACK (*PROC)(); +typedef LRESULT CALLBACK (*FARPROC)(void); +typedef INT CALLBACK (*PROC)(void); typedef WIN_BOOL CALLBACK (*GRAYSTRINGPROC)(HDC,LPARAM,INT); typedef LRESULT CALLBACK (*HOOKPROC)(INT,WPARAM,LPARAM); typedef WIN_BOOL CALLBACK (*PROPENUMPROCA)(HWND,LPCSTR,HANDLE); @@ -434,8 +438,8 @@ typedef struct typedef LRESULT CALLBACK (*DRIVERPROC16)(DWORD,HDRVR16,UINT16,LPARAM,LPARAM); typedef WIN_BOOL16 CALLBACK (*DLGPROC16)(HWND16,UINT16,WPARAM16,LPARAM); typedef INT16 CALLBACK (*EDITWORDBREAKPROC16)(LPSTR,INT16,INT16,INT16); -typedef LRESULT CALLBACK (*FARPROC16)(); -typedef INT16 CALLBACK (*PROC16)(); +typedef LRESULT CALLBACK (*FARPROC16)(void); +typedef INT16 CALLBACK (*PROC16)(void); typedef WIN_BOOL16 CALLBACK (*GRAYSTRINGPROC16)(HDC16,LPARAM,INT16); typedef LRESULT CALLBACK (*HOOKPROC16)(INT16,WPARAM16,LPARAM); typedef WIN_BOOL16 CALLBACK (*PROPENUMPROC16)(HWND16,SEGPTR,HANDLE16); |