1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-23 07:12:39 +00:00

loader gcc warning fixes and avifile sync

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13183 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rathann 2004-08-28 20:22:38 +00:00
parent 450854c020
commit 644c09f266
4 changed files with 15 additions and 15 deletions

View File

@ -1002,7 +1002,7 @@ FARPROC MODULE_GetProcAddress(
fprintf(stderr,"theQuickTimeDispatcher catched -> %p\n",retproc);
report_entry = report_func;
report_ret = report_func_ret;
wrapper_target=retproc;
wrapper_target=(void(*)(void))retproc;
retproc=(FARPROC)wrapper;
}

View File

@ -863,7 +863,7 @@ static void* WINAPI expWaitForMultipleObjects(int count, const void** objects,
for (i = 0; i < count; i++)
{
object = objects[i];
object = (void *)objects[i];
ret = expWaitForSingleObject(object, duration);
if (WaitAll)
dbgprintf("WaitAll flag not yet supported...\n");
@ -1943,7 +1943,7 @@ static DWORD WINAPI expRegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_l
LPDWORD values, LPDWORD max_value, LPDWORD max_data,
LPDWORD security, FILETIME *modif )
{
return;
return ERROR_SUCCESS;
}
/*
@ -3645,7 +3645,7 @@ static DWORD WINAPI expGetFullPathNameA
if (strrchr(lpFileName, '\\'))
lpFilePart = strrchr(lpFileName, '\\');
else
lpFilePart = lpFileName;
lpFilePart = (LPTSTR)lpFileName;
#endif
strcpy(lpBuffer, lpFileName);
// strncpy(lpBuffer, lpFileName, rindex(lpFileName, '\\')-lpFileName);

View File

@ -19,17 +19,17 @@ typedef struct __attribute__((__packed__))
#define _BITMAPINFOHEADER_
typedef struct __attribute__((__packed__))
{
int biSize;
int biWidth;
int biHeight;
long biSize;
long biWidth;
long biHeight;
short biPlanes;
short biBitCount;
int biCompression;
int biSizeImage;
int biXPelsPerMeter;
int biYPelsPerMeter;
int biClrUsed;
int biClrImportant;
long biCompression;
long biSizeImage;
long biXPelsPerMeter;
long biYPelsPerMeter;
long biClrUsed;
long biClrImportant;
} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
typedef struct {
BITMAPINFOHEADER bmiHeader;

View File

@ -156,8 +156,8 @@ typedef void VOID;
typedef int INT;
typedef unsigned int UINT;
typedef unsigned short WORD;
typedef unsigned int DWORD;
typedef unsigned int ULONG;
typedef unsigned long DWORD;
typedef unsigned long ULONG;
typedef unsigned char BYTE;
typedef long LONG;
typedef short SHORT;