Merge branch 'cc-work' of https://github.com/LemonBoy/zig into LemonBoy-cc-work

2 files changed, 2 insertions, 1 deletions

diff --git a/doc/docgen.zig b/doc/docgen.zig
index 83855b3b50..0218f50419 100644
--- a/doc/docgen.zig
+++ b/doc/docgen.zig
@@ -818,6 +818,7 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok
             .Keyword_resume,
             .Keyword_return,
             .Keyword_linksection,
+            .Keyword_callconv,
             .Keyword_stdcallcc,
             .Keyword_struct,
             .Keyword_suspend,
diff --git a/doc/langref.html.in b/doc/langref.html.in
index e16a95295c..476e370358 100644
--- a/doc/langref.html.in
+++ b/doc/langref.html.in
@@ -2829,7 +2829,7 @@ test "@tagName" {
       <p>
       By default, enums are not guaranteed to be compatible with the C ABI:
       </p>
-      {#code_begin|obj_err|parameter of type 'Foo' not allowed in function with calling convention 'ccc'#}
+      {#code_begin|obj_err|parameter of type 'Foo' not allowed in function with calling convention 'C'#}
 const Foo = enum { A, B, C };
 export fn entry(foo: Foo) void { }
       {#code_end#}