Output extern "C" function declarations and mark them 'extern'

mozilla · Aug 12, 2017 · c545161 · c545161
1 parent ecc1cfc
commit c545161
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/compile-tests/extern.rs b/compile-tests/extern.rs
@@ -0,0 +1,11 @@
+#[repr(C)]
+struct Normal {
+    x: i32,
+    y: f32,
+}
+
+extern "C" {
+    fn foo() -> i32;
+
+    fn bar(a: Normal);
+}
diff --git a/src/bindgen/bindings.rs b/src/bindgen/bindings.rs
@@ -130,10 +130,6 @@ impl Bindings {
         }
 
         for function in &self.functions {
-            if function.extern_decl {
-                continue;
-            }
-
             out.new_line_if_not_start();
             function.write(&self.config, &mut out);
             out.new_line();

diff --git a/src/bindgen/ir/function.rs b/src/bindgen/ir/function.rs
@@ -93,6 +93,9 @@ impl Source for Function {
                 out.write(prefix);
                 out.write(" ");
             }
+            if func.extern_decl {
+                out.write("extern ");
+            }
             cdecl::write_func(out, &func, false);
             if let Some(ref postfix) = postfix {
                 out.write(" ");
@@ -110,6 +113,9 @@ impl Source for Function {
                 out.write(prefix);
                 out.new_line();
             }
+            if func.extern_decl {
+                out.write("extern ");
+            }
             cdecl::write_func(out, &func, true);
             if let Some(ref postfix) = postfix {
                 out.new_line();