Change how externs are emitted for relibc

b7b2ea75 · Nagy Tibor · 95821b3b · b7b2ea75
Commit b7b2ea75 authored Oct 28, 2018 by Nagy Tibor
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 9 deletions

bindings.rs src/bindgen/bindings.rs +15 -9

No files found.
--- a/src/bindgen/bindings.rs
+++ b/src/bindgen/bindings.rs
@@ -133,11 +133,13 @@ impl Bindings {
            out.new_line();
        }

-        if self.config.language == Language::Cxx {
-            out.new_line_if_not_start();
-            out.write("extern \"C\" {");
-            out.new_line();
-        }
+        out.new_line_if_not_start();
+        out.write("#ifdef __cplusplus");
+        out.new_line();
+        out.write("extern \"C\" {");
+        out.new_line();
+        out.write("#endif");
+        out.new_line();

        for global in &self.globals {
            out.new_line_if_not_start();
@@ -157,11 +159,15 @@ impl Bindings {
            out.new_line();
        }

-        if self.config.language == Language::Cxx {
-            out.new_line_if_not_start();
-            out.write("} // extern \"C\"");
-            out.new_line();
+        out.new_line_if_not_start();
+        out.write("#ifdef __cplusplus");
+        out.new_line();
+        out.write("} // extern \"C\"");
+        out.new_line();
+        out.write("#endif");
+        out.new_line();

+        if self.config.language == Language::Cxx {
            self.close_namespaces(&mut out);
        }