forked from mirrors/gecko-dev
		
	Bug 1852806 - Remove macros for older Windows SDK from hal/. r=gsvelto
Depends on D188023 Differential Revision: https://phabricator.services.mozilla.com/D188024
This commit is contained in:
		
							parent
							
								
									0f09dfdb3e
								
							
						
					
					
						commit
						53a80005eb
					
				
					 3 changed files with 2 additions and 15 deletions
				
			
		|  | @ -63,15 +63,13 @@ elif CONFIG["OS_TARGET"] == "Linux": | |||
| elif CONFIG["OS_TARGET"] == "WINNT": | ||||
|     UNIFIED_SOURCES += [ | ||||
|         "fallback/FallbackVibration.cpp", | ||||
|         "windows/WindowsProcessPriority.cpp", | ||||
|         "windows/WindowsScreenConfiguration.cpp", | ||||
|         "windows/WindowsSensor.cpp", | ||||
|     ] | ||||
|     # WindowsBattery.cpp cannot be built in unified mode because it relies on HalImpl.h. | ||||
|     # WindowsProcessPriority.cpp needs to set _WIN32_WINNT to Windows 8 | ||||
|     # WindowsScreenConfiguration.cpp needs to set WINVER to 0x0602. | ||||
|     SOURCES += [ | ||||
|         "windows/WindowsBattery.cpp", | ||||
|         "windows/WindowsProcessPriority.cpp", | ||||
|         "windows/WindowsScreenConfiguration.cpp", | ||||
|     ] | ||||
| elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": | ||||
|     UNIFIED_SOURCES += [ | ||||
|  |  | |||
|  | @ -2,12 +2,6 @@ | |||
|  * License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||||
|  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 | ||||
| 
 | ||||
| // SetProcessInformation is only defined for Win8 and newer.
 | ||||
| #if defined(_WIN32_WINNT) | ||||
| #  undef _WIN32_WINNT | ||||
| #  define _WIN32_WINNT _WIN32_WINNT_WIN8 | ||||
| #endif  // defined(_WIN32_WINNT)
 | ||||
| 
 | ||||
| #include "Hal.h" | ||||
| #include "HalLog.h" | ||||
| #include "nsWindowsHelpers.h"  // for nsAutoHandle and nsModuleHandle
 | ||||
|  |  | |||
|  | @ -2,11 +2,6 @@ | |||
|  * License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||||
|  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 | ||||
| 
 | ||||
| #if defined(WINVER) | ||||
| #  undef WINVER | ||||
| #  define WINVER 0x0602 | ||||
| #endif | ||||
| 
 | ||||
| #include "Hal.h" | ||||
| #include "mozilla/widget/ScreenManager.h" | ||||
| #include "nsIWindowsUIUtils.h" | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 Masatoshi Kimura
						Masatoshi Kimura