guard include headers with C11 and macro flag

Author: bassiounix

libc/hdr/types/constraint_handler_t.h

@@ -9,6 +9,10 @@
 #ifndef LLVM_LIBC_HDR_TYPES_CONSTRAINT_HANDLER_T_H
 #define LLVM_LIBC_HDR_TYPES_CONSTRAINT_HANDLER_T_H
 
+#define LIBC_HAS_ANNEX_K
+
 #include "include/llvm-libc-types/constraint_handler_t.h"
 
+#undef LIBC_HAS_ANNEX_K
+
 #endif // LLVM_LIBC_HDR_TYPES_CONSTRAINT_HANDLER_T_H

libc/hdr/types/errno_t.h

@@ -9,6 +9,10 @@
 #ifndef LLVM_LIBC_HDR_TYPES_ERRNO_T_H
 #define LLVM_LIBC_HDR_TYPES_ERRNO_T_H
 
+#define LIBC_HAS_ANNEX_K
+
 #include "include/llvm-libc-types/errno_t.h"
 
+#undef LIBC_HAS_ANNEX_K
+
 #endif // LLVM_LIBC_HDR_TYPES_ERRNO_T_H

libc/include/llvm-libc-types/constraint_handler_t.h

@@ -11,7 +11,11 @@
 
 #include "errno_t.h"
 
+#ifdef LIBC_HAS_ANNEX_K
+
 typedef void (*constraint_handler_t)(const char *__restrict msg,
                                      void *__restrict ptr, errno_t error);
 
+#endif // LIBC_HAS_ANNEX_K
+
 #endif // LLVM_LIBC_INCLUDE_LLVM_LIBC_TYPES_CONSTRAINT_HANDLER_T_H

libc/include/llvm-libc-types/errno_t.h

@@ -9,6 +9,10 @@
 #ifndef LLVM_LIBC_INCLUDE_LLVM_LIBC_TYPES_ERRNO_T_H
 #define LLVM_LIBC_INCLUDE_LLVM_LIBC_TYPES_ERRNO_T_H
 
+#ifdef LIBC_HAS_ANNEX_K
+
 typedef int errno_t;
 
+#endif // LIBC_HAS_ANNEX_K
+
 #endif // LLVM_LIBC_INCLUDE_LLVM_LIBC_TYPES_ERRNO_T_H

libc/include/llvm-libc-types/rsize_t.h

@@ -9,6 +9,10 @@
 #ifndef LLVM_LIBC_TYPES_RSIZE_T_H
 #define LLVM_LIBC_TYPES_RSIZE_T_H
 
+#ifdef LIBC_HAS_ANNEX_K
+
 typedef __SIZE_TYPE__ rsize_t;
 
+#endif // LIBC_HAS_ANNEX_K
+
 #endif // LLVM_LIBC_TYPES_RSIZE_T_H

libc/include/stdlib.yaml

@@ -5,6 +5,8 @@ standards:
 merge_yaml_files:
   - stdlib-malloc.yaml
 macros:
+  - macro_name: LIBC_HAS_ANNEX_K
+    macro_header: annex-k-macros.h
   - macro_name: NULL
     macro_header: null-macro.h
 types:
@@ -189,6 +191,7 @@ functions:
     return_type: constraint_handler_t
     arguments:
       - type: constraint_handler_t
+    guard: LIBC_HAS_ANNEX_K
   - name: abort_handler_s
     standards:
       - stdc
@@ -197,6 +200,7 @@ functions:
       - type: const char *__restrict
       - type: void *__restrict
       - type: errno_t
+    guard: LIBC_HAS_ANNEX_K
   - name: ignore_handler_s
     standards:
       - stdc
@@ -205,6 +209,7 @@ functions:
       - type: const char *__restrict
       - type: void *__restrict
       - type: errno_t
+    guard: LIBC_HAS_ANNEX_K
   - name: srand
     standards:
       - stdc

libc/src/stdio/fopen_s.h

@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDIO_FOPEN_S_H
 
 #include "hdr/types/FILE.h"
-#include "include/llvm-libc-types/errno_t.h"
+#include "hdr/types/errno_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {