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. --- pkg/csource/common.go | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkg/csource/common.go') diff --git a/pkg/csource/common.go b/pkg/csource/common.go index 6e46135e1..f0b940881 100644 --- a/pkg/csource/common.go +++ b/pkg/csource/common.go @@ -40,6 +40,16 @@ func createCommonHeader(p *prog.Prog, opts Options) ([]byte, error) { if err != nil { return nil, err } + + for from, to := range map[string]string{ + "uint64": "uint64_t", + "uint32": "uint32_t", + "uint16": "uint16_t", + "uint8": "uint8_t", + } { + src = bytes.Replace(src, []byte(from), []byte(to), -1) + } + return src, nil } -- cgit mrf-deployment