Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(536)

Unified Diff: gpu/config/gpu_info_collector_win.cc

Issue 1542513002: Switch to standard integer types in gpu/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/config/gpu_info_collector_unittest.cc ('k') | gpu/config/gpu_test_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/config/gpu_info_collector_win.cc
diff --git a/gpu/config/gpu_info_collector_win.cc b/gpu/config/gpu_info_collector_win.cc
index f51764da823fb50542f6e6ccdc03fbbca6bce0e3..45087eebb03b271b2173d236030f78a1e741629c 100644
--- a/gpu/config/gpu_info_collector_win.cc
+++ b/gpu/config/gpu_info_collector_win.cc
@@ -13,6 +13,8 @@
#include <d3d11.h>
#include <dxgi.h>
#include <setupapi.h>
+#include <stddef.h>
+#include <stdint.h>
#include "base/command_line.h"
#include "base/files/file_enumerator.h"
@@ -89,8 +91,8 @@ bool IsLenovoDCuteInstalled() {
}
void DeviceIDToVendorAndDevice(const std::wstring& id,
- uint32* vendor_id,
- uint32* device_id) {
+ uint32_t* vendor_id,
+ uint32_t* device_id) {
*vendor_id = 0;
*device_id = 0;
if (id.length() < 21)
@@ -217,7 +219,7 @@ CollectInfoResult CollectDriverInfoD3D(const std::wstring& device_id,
if (id.compare(0, device_id.size(), device_id) == 0)
primary_device = drivers.size();
- uint32 vendor_id = 0, device_id = 0;
+ uint32_t vendor_id = 0, device_id = 0;
DeviceIDToVendorAndDevice(id, &vendor_id, &device_id);
driver.device.vendor_id = vendor_id;
driver.device.device_id = device_id;
@@ -354,7 +356,7 @@ CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) {
return kCollectInfoSuccess;
}
-CollectInfoResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
+CollectInfoResult CollectGpuID(uint32_t* vendor_id, uint32_t* device_id) {
DCHECK(vendor_id && device_id);
*vendor_id = 0;
*device_id = 0;
« no previous file with comments | « gpu/config/gpu_info_collector_unittest.cc ('k') | gpu/config/gpu_test_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698