diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-17 14:25:12 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-17 14:25:12 -0800 |
| commit | c0ce00fd164b3e40bb2c1046a452b4c12e295578 (patch) | |
| tree | 721f298cd488e31d2351935a7309646c1b7ecd31 /tools/codegen | |
| parent | 24e274b8d9c9617bc10b9dcde66864fb2884b58c (diff) | |
| parent | c77dc39771d0e0fb8a581636bb9c3dc1adef3fb1 (diff) | |
Merge github.com:grpc/grpc into sceq
Diffstat (limited to 'tools/codegen')
| -rw-r--r-- | tools/codegen/core/gen_legal_metadata_characters.c | 4 | ||||
| -rwxr-xr-x | tools/codegen/core/gen_static_metadata.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/codegen/core/gen_legal_metadata_characters.c b/tools/codegen/core/gen_legal_metadata_characters.c index 3c9e1c7619..10605d52bf 100644 --- a/tools/codegen/core/gen_legal_metadata_characters.c +++ b/tools/codegen/core/gen_legal_metadata_characters.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -52,7 +52,7 @@ static void legal(int x) { static void dump(void) { int i; - printf("static const gpr_uint8 legal_header_bits[256/8] = "); + printf("static const uint8_t legal_header_bits[256/8] = "); for (i = 0; i < 256 / 8; i++) printf("%c 0x%02x", i ? ',' : '{', legal_bits[i]); printf(" };\n"); diff --git a/tools/codegen/core/gen_static_metadata.py b/tools/codegen/core/gen_static_metadata.py index 3e47d7f6d5..e6ae00e611 100755 --- a/tools/codegen/core/gen_static_metadata.py +++ b/tools/codegen/core/gen_static_metadata.py @@ -1,6 +1,6 @@ #!/usr/bin/env python2.7 -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -50,8 +50,8 @@ CONFIG = [ 'host', 'grpc-message', 'grpc-status', - 'census', 'census-bin', + 'census-binary-bin', '', ('grpc-status', '0'), ('grpc-status', '1'), |