[Libreoffice-commits] core.git: desktop/source desktop/win32

Michael Stahl mstahl at redhat.com
Tue Jan 3 20:25:27 UTC 2017


 desktop/source/app/cmdlinehelp.cxx                 |    4 ----
 desktop/win32/source/officeloader/officeloader.cxx |    3 ---
 2 files changed, 7 deletions(-)

New commits:
commit 7e7fcb7ee614be44589d0ca90e7785a4efcf1457
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jan 3 21:18:08 2017 +0100

    desktop: remove unnecessary #define _WIN32_WINNT 0x0501
    
    gb_OSDEFS already globally sets at least 0x0502
    
    Change-Id: I52b75dc114eb498232faeb70ec75948ad01d3675

diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 3c904ac..26ce708 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -27,10 +27,6 @@
 #include "cmdlinehelp.hxx"
 
 #ifdef _WIN32
-#if _WIN32_WINNT < 0x0501
-// For AttachConsole() and MAPVK_VK_TO_VSC
-#define _WIN32_WINNT 0x0501
-#endif
 #include "windows.h"
 #include "io.h"
 #include "fcntl.h"
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index 25f3537..e841e87 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -23,9 +23,6 @@
 #include <cstddef>
 #include <cwchar>
 
-#if _WIN32_WINNT < 0x0501
-#define _WIN32_WINNT 0x0501
-#endif
 #define WIN32_LEAN_AND_MEAN
 #if defined _MSC_VER
 #pragma warning(push, 1)


More information about the Libreoffice-commits mailing list