summaryrefslogtreecommitdiffstats
path: root/loader/win32.c
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-28 20:22:38 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-28 20:22:38 +0000
commit644c09f266f93781b4beefbe5b283207f1aa6db4 (patch)
tree82ac206683cd7c99fa84a57efbf6365ffd60008d /loader/win32.c
parent450854c020de0450394c72b4ab2f3bc23834bf78 (diff)
downloadmpv-644c09f266f93781b4beefbe5b283207f1aa6db4.tar.bz2
mpv-644c09f266f93781b4beefbe5b283207f1aa6db4.tar.xz
loader gcc warning fixes and avifile sync
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13183 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/win32.c')
-rw-r--r--loader/win32.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/loader/win32.c b/loader/win32.c
index ce539a34f3..964a9a06d5 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -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);