merge conflicts

llvm · Jul 16, 2024 · 3ba2d40 · 3ba2d40
1 parent 8072087
commit 3ba2d40
Showing 1 changed file with 27 additions and 3 deletions.
diff --git a/libc/newhdrgen/header.py b/libc/newhdrgen/header.py
@@ -57,14 +57,38 @@ def __str__(self):
 
         content.append("\n__BEGIN_C_DECLS\n")
 
+        current_guard = None
         for function in self.functions:
-            content.append(str(function) + "__NOEXCEPT")
-            content.append("")
+            if function.guard == None:
+                content.append(str(function) + "__NOEXCEPT")
+                content.append("")
+            else:
+                if current_guard == None:
+                    current_guard = function.guard
+                    content.append(f"#ifdef {current_guard}")
+                    content.append(str(function) + "__NOEXCEPT")
+                    content.append("")
+                elif current_guard == function.guard:
+                    content.append(str(function) + "__NOEXCEPT")
+                    content.append("")
+                else:
+                    content.pop()
+                    content.append(f"#endif // {current_guard}")
+                    content.append("")
+                    current_guard = function.guard
+                    content.append(f"#ifdef {current_guard}")
+                    content.append(str(function) + "__NOEXCEPT")
+                    content.append("")
+        if current_guard != None:
+            content.pop()
+            content.append(f"#endif // {current_guard}")
+            content.append("")      
+
         for object in self.objects:
             content.append(str(object))
         if self.objects:
             content.append("\n__END_C_DECLS")
         else:
             content.append("__END_C_DECLS")
 
-        return "\n".join(content)
+        return "\n".join(content)