From fd3e9f2b9720b9ba730938686b98cff3aa248984 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 27 Dec 2017 10:56:12 +0100 Subject: executor: introduce uint64/32/16/8 types The "define uint64_t unsigned long long" were too good to work. With a different toolchain I am getting: cstdint:69:11: error: expected unqualified-id using ::uint64_t; ^ executor/common.h:34:18: note: expanded from macro 'uint64_t' Do it the proper way: introduce uint64/32/16/8 types and use them. pkg/csource then does s/uint64/uint64_t/ to not clutter code with additional typedefs. --- executor/executor_akaros.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'executor/executor_akaros.cc') diff --git a/executor/executor_akaros.cc b/executor/executor_akaros.cc index 8cb87d3d7..90b589e77 100644 --- a/executor/executor_akaros.cc +++ b/executor/executor_akaros.cc @@ -12,7 +12,7 @@ #include "syscalls_akaros.h" -uint32_t output; +uint32 output; int main(int argc, char** argv) { @@ -43,13 +43,13 @@ int main(int argc, char** argv) doexit(0); } int status = 0; - uint64_t start = current_time_ms(); + uint64 start = current_time_ms(); for (;;) { int res = waitpid(pid, &status, WNOHANG); if (res == pid) break; sleep_ms(10); - uint64_t now = current_time_ms(); + uint64 now = current_time_ms(); if (now - start < 3 * 1000) continue; kill(pid, SIGKILL); @@ -85,17 +85,17 @@ void cover_reset(thread_t* th) { } -uint64_t read_cover_size(thread_t* th) +uint64 read_cover_size(thread_t* th) { return 0; } -uint32_t* write_output(uint32_t v) +uint32* write_output(uint32 v) { return &output; } -void write_completed(uint32_t completed) +void write_completed(uint32 completed) { } -- cgit mrf-deployment