diff options
| author | Johannes Schickel | 2011-03-08 20:23:31 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-03-08 20:23:31 +0100 |
| commit | b0cd614fd5a9b89765c7c3890a830abddc6d14f2 (patch) | |
| tree | 0c60a3cbf0d2a5f2551b94099e4414d35163caa3 /backends | |
| parent | 0e7dc36792e8472f823af56a43f6d75aba3db29b (diff) | |
| download | scummvm-rg350-b0cd614fd5a9b89765c7c3890a830abddc6d14f2.tar.gz scummvm-rg350-b0cd614fd5a9b89765c7c3890a830abddc6d14f2.tar.bz2 scummvm-rg350-b0cd614fd5a9b89765c7c3890a830abddc6d14f2.zip | |
WINCE: Silence/fix some warnings.
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/platform/wince/CEDevice.cpp | 7 | ||||
| -rw-r--r-- | backends/platform/wince/missing/missing.cpp | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/backends/platform/wince/CEDevice.cpp b/backends/platform/wince/CEDevice.cpp index 3686944cce..f90d5e2966 100644 --- a/backends/platform/wince/CEDevice.cpp +++ b/backends/platform/wince/CEDevice.cpp @@ -85,13 +85,12 @@ void CEDevice::init() { // 2003+ power management code borrowed from MoDaCo & Betaplayer. Thanks ! HINSTANCE dll = LoadLibrary(TEXT("aygshell.dll")); if (dll) { - *(FARPROC*)&_SHIdleTimerReset = GetProcAddress(dll, MAKEINTRESOURCE(2006)); + _SHIdleTimerReset = (void (*)())GetProcAddress(dll, MAKEINTRESOURCE(2006)); } dll = LoadLibrary(TEXT("coredll.dll")); if (dll) { - *(FARPROC*)&_SetPowerRequirement = GetProcAddress(dll, TEXT("SetPowerRequirement")); - *(FARPROC*)&_ReleasePowerRequirement = GetProcAddress(dll, TEXT("ReleasePowerRequirement")); - + _SetPowerRequirement = (HANDLE (*)(PVOID,int,ULONG,PVOID,ULONG))GetProcAddress(dll, TEXT("SetPowerRequirement")); + _ReleasePowerRequirement = (DWORD (*)(HANDLE))GetProcAddress(dll, TEXT("ReleasePowerRequirement")); } if (_SetPowerRequirement) _hPowerManagement = _SetPowerRequirement((PVOID) TEXT("BKL1:"), 0, 1, (PVOID) NULL, 0); diff --git a/backends/platform/wince/missing/missing.cpp b/backends/platform/wince/missing/missing.cpp index 92af3e6961..7de706b23f 100644 --- a/backends/platform/wince/missing/missing.cpp +++ b/backends/platform/wince/missing/missing.cpp @@ -63,7 +63,7 @@ void *bsearch(const void *key, const void *base, size_t nmemb, else if (tmp > 0) lo = mid + 1; else - return (void *)p; + return const_cast<void *>(p); } return NULL; @@ -158,7 +158,7 @@ int _access(const char *path, int mode) { // hits for files that don't exist. TRIPLE checking for the same fname // seems to weed out those false positives. // Exhibited in kyra engine. - HANDLE h = FindFirstFile(fname, &ffd); + h = FindFirstFile(fname, &ffd); FindClose(h); if (h == INVALID_HANDLE_VALUE) return -1; //Can't find file |