Bug 1288595 - Guard DPI_AWARENESS_CONTEXT defines against Windows SDK beta (10.0.14383.0). r=jfkthame
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 22 Jul 2016 12:43:15 +0900
changeset 331412 1198cb175ed76649ba303012db91b9793d5a14b5
parent 331411 25e7c04db48f48e34b7096c8af8dc41d1cd18e9e
child 331413 13a135813767793c0ac1d185d4983b222b29d9c4
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjfkthame
bugs1288595, 14383
milestone50.0a1
Bug 1288595 - Guard DPI_AWARENESS_CONTEXT defines against 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