Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(811)

Unified Diff: src/ports/SkOSFile_win.cpp

Issue 198643004: Fixed cross compilation with mingw. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/ports/SkOSFile_win.cpp
diff --git a/src/ports/SkOSFile_win.cpp b/src/ports/SkOSFile_win.cpp
index 7fec557987e307d6faae0789aea88a04f51fc294..fd1c367318cb75dca70f6404dffabadb532c7f3f 100644
--- a/src/ports/SkOSFile_win.cpp
+++ b/src/ports/SkOSFile_win.cpp
@@ -50,18 +50,18 @@ bool sk_fidentical(SkFILE* a, SkFILE* b) {
&& aID.fVolume == bID.fVolume;
}
-template <typename HandleType, HandleType InvalidValue, BOOL (WINAPI * Close)(HandleType)>
+template <typename HandleType, LONG_PTR InvalidValue, BOOL (WINAPI * Close)(HandleType)>
bungeman-skia 2014/03/14 14:50:37 Ick, ack, uck. So technically... in the C++ specif
class SkAutoTHandle : SkNoncopyable {
public:
SkAutoTHandle(HandleType handle) : fHandle(handle) { }
~SkAutoTHandle() { Close(fHandle); }
operator HandleType() { return fHandle; }
- bool isValid() { return InvalidValue != fHandle; }
+ bool isValid() { return HandleType(InvalidValue) != fHandle; }
private:
HandleType fHandle;
};
-typedef SkAutoTHandle<HANDLE, INVALID_HANDLE_VALUE, CloseHandle> SkAutoWinFile;
-typedef SkAutoTHandle<HANDLE, NULL, CloseHandle> SkAutoWinMMap;
+typedef SkAutoTHandle<HANDLE, -1 /* INVALID_HANDLE_VALUE */, CloseHandle> SkAutoWinFile;
+typedef SkAutoTHandle<HANDLE, 0 /* NULL */, CloseHandle> SkAutoWinMMap;
void sk_fmunmap(const void* addr, size_t) {
UnmapViewOfFile(addr);

Powered by Google App Engine
This is Rietveld 408576698