https://git.reactos.org/?p=reactos.git;a=commitdiff;h=534a309edcac565afa82f4...
commit 534a309edcac565afa82f4356e942ae9aaed3b2e Author: Serge Gautherie 32623169+SergeGautherie@users.noreply.github.com AuthorDate: Fri Jun 29 14:17:29 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO hermes.belusca-maito@reactos.org CommitDate: Fri Jun 29 14:17:29 2018 +0200
[NOTEPAD] Fix a MSVC warning about Globals.encFile (#648)
"...\dialog.c(365) : error C4133: 'function' : incompatible types - from 'ENCODING *' to 'int *'" CORE-7538 --- base/applications/notepad/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 04e6e7b837..e1c660b7ae 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -362,7 +362,7 @@ VOID DoOpenFile(LPCTSTR szFileName) goto done; }
- if (!ReadText(hFile, (LPWSTR *)&pszText, &dwTextLen, &Globals.encFile, &Globals.iEoln)) + if (!ReadText(hFile, (LPWSTR *)&pszText, &dwTextLen, (int *)&Globals.encFile, &Globals.iEoln)) { ShowLastError(); goto done;