Make TypedefElaborated respect @add_def

src/generator/definitions.jl

@@ -12,7 +12,6 @@ const DEFAULT_EXTRA_DEFINITIONS = Dict{Symbol,AbstractJuliaType}(
     :int16_t => JuliaCint16_t(),
     :int8_t => JuliaCint8_t(),
     :uintptr_t => JuliaCuintptr_t(),
-    :tm => JuliaCtm(),
     :wchar_t => JuliaCwchar_t(),
     :va_list => JuliaUnsupported(),
     :FILE => JuliaCFILE(),

src/generator/resolve_deps.jl

@@ -87,6 +87,8 @@ function resolve_dependency!(dag::ExprDAG, node::ExprNode{TypedefElaborated}, op
 
     if haskey(dag.tags, leaf_ty.sym)
         push!(node.adj, dag.tags[leaf_ty.sym])
+    elseif haskey(dag.ids_extra, leaf_ty.sym)
+        # pass
     else
         tycu = getTypeDeclaration(ty)
         file, line, col = get_file_line_column(cursor)

src/generator/system_deps.jl

@@ -71,7 +71,7 @@ function collect_dependent_system_nodes!(dag::ExprDAG, node::ExprNode{TypedefEla
 
     is_jl_basic(leaf_ty) && return system_nodes
 
-    if !haskey(dag.tags, leaf_ty.sym)
+    if !(haskey(dag.tags, leaf_ty.sym) || haskey(dag.ids_extra, leaf_ty.sym))
         # add all sys nodes with the same id
         for (i, n) in enumerate(dag.sys)
             if n.id == leaf_ty.sym

test/generators.jl

@@ -56,6 +56,16 @@ end
     @test include("LibDependency.jl") isa Any
 end
 
+@testset "Issue 320" begin
+    args = get_default_args()
+    dir = joinpath(@__DIR__, "sys")
+    push!(args, "-isystem$dir")
+    headers = [joinpath(@__DIR__, "include", "test.h")]
+    ctx = create_context(headers, args)
+    @add_def stat
+    @test build!(ctx, BUILDSTAGE_NO_PRINTING) isa Any
+end
+
 @testset "Escape anonymous name with var\"\"" begin
     args = get_default_args()
     headers = joinpath(@__DIR__, "include", "escape-with-var.h")
@@ -64,4 +74,4 @@ end
     ctx = create_context(headers, args, options)
     build!(ctx)
     @test include("LibEscapeWithVar.jl") isa Any
-end
+end

test/include/test.h

@@ -0,0 +1,7 @@
+#ifndef TEST
+#define TEST
+#include "system.h"
+
+typedef struct stat mystat;
+
+#endif /* TEST */

test/sys/system.h

@@ -0,0 +1,6 @@
+#ifndef SYSTEM
+#define SYSTEM
+void stat(void);
+struct stat {};
+
+#endif /* SYSTEM */