Bug 1288595 - Conflict DECLARE_HANDLE(DPI_AWARENESS_CONTEXT) with the latest Windows SDK beta (10.0.14383.0). r?jfkthame draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 22 Jul 2016 12:43:15 +0900
changeset 391120 74c4ae405c3452891f5f3df342ea317bb8b5fb5d
parent 391031 2e3390571fdb3a1ff3d2f7f828adf67dbc237bc8
child 526132 213a9077657571c1c94c4ff3773470c1012ed463
push id23811
push userm_kato@ga2.so-net.ne.jp
push dateFri, 22 Jul 2016 03:44:29 +0000
reviewersjfkthame
bugs1288595, 14383
milestone50.0a1
Bug 1288595 - Conflict DECLARE_HANDLE(DPI_AWARENESS_CONTEXT) with the latest Windows SDK beta (10.0.14383.0). r?jfkthame MozReview-Commit-ID: 6CMZ3mVhWd5
widget/windows/WinUtils.h
--- a/widget/windows/WinUtils.h
+++ b/widget/windows/WinUtils.h
@@ -73,17 +73,17 @@ protected:                              
   nsAutoRefCnt mRefCnt;                                                       \
   NS_DECL_OWNINGTHREAD                                                        \
 public:
 
 class nsWindow;
 class nsWindowBase;
 struct KeyPair;
 
-#ifndef DPI_AWARENESS_CONTEXT_DECLARED
+#if !defined(DPI_AWARENESS_CONTEXT_DECLARED) && !defined(DPI_AWARENESS_CONTEXT_UNAWARE)
 
 DECLARE_HANDLE(DPI_AWARENESS_CONTEXT);
 
 typedef enum DPI_AWARENESS {
   DPI_AWARENESS_INVALID = -1,
   DPI_AWARENESS_UNAWARE = 0,
   DPI_AWARENESS_SYSTEM_AWARE = 1,
   DPI_AWARENESS_PER_MONITOR_AWARE = 2