aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2013-03-24 08:27:58 +1100
committernyamatongwe <devnull@localhost>2013-03-24 08:27:58 +1100
commit28aafe5c11e129638a1f54382d8d34ac4e8dbae3 (patch)
tree3ce8425c2edd070c020eacce08e1f27a1aa03fc9
parentd123f6bfc56638d3da96d429d80e289adc477178 (diff)
downloadscintilla-mirror-28aafe5c11e129638a1f54382d8d34ac4e8dbae3.tar.gz
Extra cast to avoid warning from g++ 4.8.
-rw-r--r--win32/ScintillaWin.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 1b3465ead..4fbeda992 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -694,7 +694,7 @@ static UINT CodePageFromCharSet(DWORD characterSet, UINT documentCodePage) {
return SC_CP_UTF8;
}
CHARSETINFO ci = { 0, 0, { { 0, 0, 0, 0 }, { 0, 0 } } };
- BOOL bci = ::TranslateCharsetInfo((DWORD*)characterSet,
+ BOOL bci = ::TranslateCharsetInfo(reinterpret_cast<DWORD*>(static_cast<uptr_t>(characterSet)),
&ci, TCI_SRCCHARSET);
UINT cp;