diff options
author | Kai Koehne <kai.koehne@digia.com> | 2012-12-11 10:46:56 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-11 16:32:39 +0100 |
commit | cf728e60a71629096188f5d680047414dbb4956b (patch) | |
tree | 8b6954b34c00bde93dbadf9898c8933757280082 /src/corelib/io/qprocess_win.cpp | |
parent | 529110343d8067597b12a822126a2eb569295095 (diff) |
Fix compilation with (all versions of) MinGW
Commit 320b16110f0f9cef032a64846dc792d40ccd367b changed the arguments
of swprintf to be compliant with latest MinGW-w64 headers: The headers now
excludes the non-standard swprintf(wchar*t,wchar_t*,...) version for C++11.
However, the swprintf(wchar_t*,size_t,wchar_t*,...) version is actually
not supported by e.g. stock Mingw-32 from mingw.org.
Instead, use _snwprintf(wchar_t*,size_t,wchar_t*,...), which both
MSVC, and all MinGW versions should support.
Task-number: QTBUG-28520
Change-Id: Icadd11773a25143e46a72c898adfd1c324f9c468
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/corelib/io/qprocess_win.cpp')
-rw-r--r-- | src/corelib/io/qprocess_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index 780efda7fc..bd2ca4c325 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -82,7 +82,7 @@ static void qt_create_pipe(Q_PIPE *pipe, bool isInputPipe) forever { // ### The user must make sure to call qsrand() to make the pipe names less predictable. // ### Replace the call to qrand() with a secure version, once we have it in Qt. - swprintf(pipeName, sizeof(pipeName) / sizeof(pipeName[0]), + _snwprintf(pipeName, sizeof(pipeName) / sizeof(pipeName[0]), L"\\\\.\\pipe\\qt-%X", qrand()); DWORD dwPipeFlags = PIPE_TYPE_BYTE | PIPE_WAIT; |