Mercurial > octave-nkf

changeset 16999:477ed3b55497

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
QWinTerminalImpl.cpp: Don't define _WIN32_WINNT unconditionally. * libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp: Don't define _WIN32_WINNT unconditionally.
author Michael Goffioul <michael.goffioul@gmail.com>
date Thu, 18 Jul 2013 10:04:01 -0400
parents 5069b6c6c062
children 45165d6c4738
files libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Wed Jul 17 20:11:36 2013 -0700
+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Thu Jul 18 10:04:01 2013 -0400
@@ -40,7 +40,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 #define WIN32_LEAN_AND_MEAN
-#define _WIN32_WINNT 0x0500 
+#if ! defined (_WIN32_WINNT) && ! defined (NTDDI_VERSION)
+#define _WIN32_WINNT 0x0500
+#endif
 #include <windows.h>
 #include <cstring>
 #include <csignal>