diff --git a/cmd/internal/cgen/cgen.go b/cmd/internal/cgen/cgen.go index 11f233f2..d70b5090 100644 --- a/cmd/internal/cgen/cgen.go +++ b/cmd/internal/cgen/cgen.go @@ -26,10 +26,7 @@ func (g *Generator) Generate(pkgName string, m *t.IDMap, files []*a.File) ([]byt // Write preamble. fmt.Fprintf(b, "// Code generated by puffs-gen-%c. DO NOT EDIT.\n\n", g.Extension) b.WriteString(preamble) - b.WriteByte('\n') - if g.Extension == 'h' { - b.WriteString("#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n") - } + b.WriteString("\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n") b.WriteString("// ---------------- Status Codes\n\n") b.WriteString("typedef enum {\n") @@ -60,24 +57,23 @@ func (g *Generator) Generate(pkgName string, m *t.IDMap, files []*a.File) ([]byt } } - if g.Extension != 'h' { - b.WriteString("// ---------------- Constructor and Destructor Implementations\n\n") - for _, f := range files { - for _, n := range f.TopLevelDecls() { - if n.Kind() == a.KStruct { - if err := writeCtorImpls(b, pkgName, m, n.Struct()); err != nil { - return nil, err - } + // Finish up the header, which is also the first part of the .c file. + b.WriteString("\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n") + if g.Extension == 'h' { + return format(b) + } + + b.WriteString("// ---------------- Constructor and Destructor Implementations\n\n") + for _, f := range files { + for _, n := range f.TopLevelDecls() { + if n.Kind() == a.KStruct { + if err := writeCtorImpls(b, pkgName, m, n.Struct()); err != nil { + return nil, err } } } } - // Write postamble. - if g.Extension == 'h' { - b.WriteString("\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n") - } - return format(b) } diff --git a/gen/c/gif.c b/gen/c/gif.c index ac0539c4..925d4b90 100644 --- a/gen/c/gif.c +++ b/gen/c/gif.c @@ -15,6 +15,10 @@ #error "Puffs requires a word size of at least 32 bits" #endif +#ifdef __cplusplus +extern "C" { +#endif + // ---------------- Status Codes typedef enum { @@ -39,6 +43,10 @@ void puffs_gif_lzw_decoder_constructor(puffs_gif_lzw_decoder* self); void puffs_gif_lzw_decoder_destructor(puffs_gif_lzw_decoder* self); +#ifdef __cplusplus +} // extern "C" +#endif + // ---------------- Constructor and Destructor Implementations void puffs_gif_lzw_decoder_constructor(puffs_gif_lzw_decoder* self) {