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

Unified Diff: sandbox/win/src/target_services.cc

Issue 1538283002: Switch to standard integer types in sandbox/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: macros 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 | « sandbox/win/src/target_services.h ('k') | sandbox/win/src/threadpool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/win/src/target_services.cc
diff --git a/sandbox/win/src/target_services.cc b/sandbox/win/src/target_services.cc
index e10f7ca411488e0393d8ec84c9d32266fbff2aaa..7537245b655b88f4d0c42d80b70b9d9e3a681d5e 100644
--- a/sandbox/win/src/target_services.cc
+++ b/sandbox/win/src/target_services.cc
@@ -7,8 +7,8 @@
#include <new>
#include <process.h>
+#include <stdint.h>
-#include "base/basictypes.h"
#include "base/win/windows_version.h"
#include "sandbox/win/src/crosscall_client.h"
#include "sandbox/win/src/handle_closer_agent.h"
@@ -17,9 +17,9 @@
#include "sandbox/win/src/process_mitigations.h"
#include "sandbox/win/src/restricted_token_utils.h"
#include "sandbox/win/src/sandbox.h"
+#include "sandbox/win/src/sandbox_nt_util.h"
#include "sandbox/win/src/sandbox_types.h"
#include "sandbox/win/src/sharedmem_ipc_client.h"
-#include "sandbox/win/src/sandbox_nt_util.h"
namespace {
@@ -168,8 +168,8 @@ bool TargetServicesBase::TestIPCPing(int version) {
CrossCallReturn answer = {0};
if (1 == version) {
- uint32 tick1 = ::GetTickCount();
- uint32 cookie = 717115;
+ uint32_t tick1 = ::GetTickCount();
+ uint32_t cookie = 717115;
ResultCode code = CrossCall(ipc, IPC_PING1_TAG, cookie, &answer);
if (SBOX_ALL_OK != code) {
@@ -182,7 +182,7 @@ bool TargetServicesBase::TestIPCPing(int version) {
}
// We test the first extended answer to be within the bounds of the tick
// count only if there was no tick count wraparound.
- uint32 tick2 = ::GetTickCount();
+ uint32_t tick2 = ::GetTickCount();
if (tick2 >= tick1) {
if ((answer.extended[0].unsigned_int < tick1) ||
(answer.extended[0].unsigned_int > tick2)) {
@@ -194,7 +194,7 @@ bool TargetServicesBase::TestIPCPing(int version) {
return false;
}
} else if (2 == version) {
- uint32 cookie = 717111;
+ uint32_t cookie = 717111;
InOutCountedBuffer counted_buffer(&cookie, sizeof(cookie));
ResultCode code = CrossCall(ipc, IPC_PING2_TAG, counted_buffer, &answer);
« no previous file with comments | « sandbox/win/src/target_services.h ('k') | sandbox/win/src/threadpool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698