anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix return types for mingw-w64

Browse Source 
This is needed for warning-free compilation with mingw-w64, and does not hurt
for other build configurations. Patch by Shankar Giri Venkita Giri (bug 10053).
This commit is contained in:
Shankar Giri Venkita Giri 2016-05-05 12:54:53 +02:00 committed by Richard Heck
parent ee13c5b7e2
commit 88b68ee004
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/support/filetools.cpp
View File

@ -1065,7 +1065,7 @@ cmd_ret const runCommand(string const & cmd)
0, 0, &startup, &process)) { 0, 0, &startup, &process)) {
CloseHandle(process.hThread); CloseHandle(process.hThread);
int fno = _open_osfhandle((long)in, _O_RDONLY); int fno = _open_osfhandle(static_cast<intptr_t>(in), _O_RDONLY);
CloseHandle(out); CloseHandle(out);
inf = _fdopen(fno, "r"); inf = _fdopen(fno, "r");
} }

2
src/support/os_win32.cpp
View File

@ -569,7 +569,7 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode,
// reference: http://msdn.microsoft.com/en-us/library/bb762153.aspx // reference: http://msdn.microsoft.com/en-us/library/bb762153.aspx
char const * action = (mode == VIEW) ? "open" : "edit"; char const * action = (mode == VIEW) ? "open" : "edit";
bool success = reinterpret_cast<int>(ShellExecute(NULL, action, bool success = reinterpret_cast<intptr_t>(ShellExecute(NULL, action,
to_local8bit(from_utf8(filename)).c_str(), NULL, NULL, 1)) > 32; to_local8bit(from_utf8(filename)).c_str(), NULL, NULL, 1)) > 32;
if (!path.empty() && !lyxrc.texinputs_prefix.empty()) { if (!path.empty() && !lyxrc.texinputs_prefix.empty()) {