Added missing libcxx headers and using:: declarations. (#532)

ZERICO2005 · web-flow · commit bb562f7225f6 · 2025-01-22T21:45:56.000+01:00
diff --git a/src/libc/include/fenv.h b/src/libc/include/fenv.h
@@ -83,6 +83,6 @@ int feupdateenv(const fenv_t *);
 }
 #endif
 
-#endif
+#endif /* _FENV_P_ONLY */
 
-#endif
+#endif /* _FENV_P */
diff --git a/src/libc/include/float.h b/src/libc/include/float.h
@@ -6,13 +6,13 @@
 
 #define  FLT_RADIX        __FLT_RADIX__
 
-#if __STDC_VERSION__ >= 199901L
+#if (__STDC_VERSION__ >= 199901L) || (defined(__cplusplus) && __cplusplus >= 201103L)
 #define  FLT_EVAL_METHOD  __FLT_EVAL_METHOD__
 
 #define      DECIMAL_DIG      __DECIMAL_DIG__
 #endif
 
-#if __STDC_VERSION__ >= 201112L
+#if (__STDC_VERSION__ >= 201112L) || (defined(__cplusplus) && __cplusplus >= 201703L)
 #define  FLT_DECIMAL_DIG  __FLT_DECIMAL_DIG__
 #define  DBL_DECIMAL_DIG  __DBL_DECIMAL_DIG__
 #define LDBL_DECIMAL_DIG __LDBL_DECIMAL_DIG__
@@ -64,4 +64,4 @@
 
 #define  FLT_ROUNDS      ((__fe_cur_env ^ 1) & 3)
 
-#endif
+#endif /* _FLOAT_H */
diff --git a/src/libc/include/inttypes.h b/src/libc/include/inttypes.h
@@ -165,7 +165,7 @@
 #define SCNxMAX          __UINTMAX_FMTx__
 
 #define SCNdPTR           __INTPTR_FMTd__
-#define SCNiPTR          __ INTPTR_FMTi__
+#define SCNiPTR           __INTPTR_FMTi__
 #define SCNoPTR          __UINTPTR_FMTo__
 #define SCNuPTR          __UINTPTR_FMTu__
 #define SCNxPTR          __UINTPTR_FMTx__
diff --git a/src/libc/include/math.h b/src/libc/include/math.h
@@ -301,4 +301,4 @@ long double truncl(long double);
 }
 #endif
 
-#endif
+#endif /* _MATH_H */
diff --git a/src/libc/include/setjmp.h b/src/libc/include/setjmp.h
@@ -12,4 +12,4 @@ void longjmp(jmp_buf env, int val) __attribute__((noreturn));
 
 __END_DECLS
 
-#endif
+#endif /* _SETJMP_H */
diff --git a/src/libc/include/stdlib.h b/src/libc/include/stdlib.h
@@ -4,18 +4,18 @@
 #include <cdefs.h>
 
 typedef struct {
-  int quot;
-  int rem;
+    int quot;
+    int rem;
 } div_t;
 
 typedef struct {
-  long quot;
-  long rem;
+    long quot;
+    long rem;
 } ldiv_t;
 
 typedef struct {
-  long long rem;
-  long long quot;
+    long long rem;
+    long long quot;
 } lldiv_t;
 
 #define EXIT_SUCCESS 0
diff --git a/src/libc/include/string.h b/src/libc/include/string.h
@@ -14,7 +14,7 @@ void *memmove(void *dest, const void *src, size_t n)
 void *memset(void *s, int c, size_t n) __attribute__((nonnull(1)));
 
 int memcmp(const void *s1, const void *s2, size_t n)
-          __attribute__((nonnull(1, 2)));
+           __attribute__((nonnull(1, 2)));
 
 void *memchr(const void *s, int c, size_t n) __attribute__((nonnull(1)));
 
diff --git a/src/libc/include/time.h b/src/libc/include/time.h
@@ -15,15 +15,15 @@ typedef unsigned long time_t;
 typedef unsigned long clock_t;
 
 struct tm {
-   int tm_sec;
-   int tm_min;
-   int tm_hour;
-   int tm_mday;
-   int tm_mon;
-   int tm_year;
-   int tm_wday;
-   int tm_yday;
-   int tm_isdst;
+    int tm_sec;
+    int tm_min;
+    int tm_hour;
+    int tm_mday;
+    int tm_mon;
+    int tm_year;
+    int tm_wday;
+    int tm_yday;
+    int tm_isdst;
 };
 
 __BEGIN_DECLS
diff --git a/src/libcxx/include/cassert b/src/libcxx/include/cassert
@@ -1,5 +1,9 @@
 // -*- C++ -*-
+#ifndef _EZCXX_CASSERT
+#define _EZCXX_CASSERT
 
 #include <assert.h>
 
 #pragma clang system_header
+
+#endif // _EZCXX_CASSERT
diff --git a/src/libcxx/include/cctype b/src/libcxx/include/cctype
@@ -9,6 +9,7 @@
 namespace std {
 using ::isalnum;
 using ::isalpha;
+using ::isblank;
 using ::iscntrl;
 using ::isdigit;
 using ::isgraph;
diff --git a/src/libcxx/include/cerrno b/src/libcxx/include/cerrno
@@ -0,0 +1,13 @@
+// -*- C++ -*-
+#ifndef _EZCXX_CERRNO
+#define _EZCXX_CERRNO
+
+#include <errno.h>
+
+#pragma clang system_header
+
+namespace std {
+using ::errno;
+} // namespace std
+
+#endif // _EZCXX_CERRNO
diff --git a/src/libcxx/include/cfloat b/src/libcxx/include/cfloat
@@ -0,0 +1,9 @@
+// -*- C++ -*-
+#ifndef _EZCXX_CFLOAT
+#define _EZCXX_CFLOAT
+
+#include <float.h>
+
+#pragma clang system_header
+
+#endif // _EZCXX_CFLOAT
diff --git a/src/libcxx/include/cinttypes b/src/libcxx/include/cinttypes
@@ -0,0 +1,22 @@
+// -*- C++ -*-
+#ifndef _EZCXX_CINTTYPES
+#define _EZCXX_CINTTYPES
+
+#include <inttypes.h>
+#include <cstdint>
+
+#pragma clang system_header
+
+namespace std {
+
+using ::imaxdiv_t;
+
+using ::imaxabs;
+inline constexpr intmax_t abs(intmax_t __x) { return imaxabs(__x); }
+
+using ::imaxdiv;
+inline constexpr imaxdiv_t div(intmax_t __x, intmax_t __y) { return imaxdiv(__x, __y); }
+
+} // namespace std
+
+#endif // _EZCXX_CINTTYPES
diff --git a/src/libcxx/include/ciso646 b/src/libcxx/include/ciso646
@@ -0,0 +1,9 @@
+// -*- C++ -*-
+#ifndef _EZCXX_CISO646
+#define _EZCXX_CISO646
+
+#include <iso646.h>
+
+#pragma clang system_header
+
+#endif // _EZCXX_CISO646
diff --git a/src/libcxx/include/concepts b/src/libcxx/include/concepts
@@ -27,4 +27,4 @@ concept floating_point = is_floating_point_v<_Tp>;
 
 } // namespace std
 
-#endif // _EZCXX_CONCEPTS
+#endif // _EZCXX_CONCEPTS
diff --git a/src/libcxx/include/csetjmp b/src/libcxx/include/csetjmp
@@ -0,0 +1,15 @@
+// -*- C++ -*-
+#ifndef _EZCXX_CSETJMP
+#define _EZCXX_CSETJMP
+
+#include <setjmp.h>
+
+#pragma clang system_header
+
+namespace std {
+using ::jmp_buf;
+using ::setjmp;
+using ::longjmp;
+} // namespace std
+
+#endif // _EZCXX_CSETJMP
diff --git a/src/libcxx/include/cstdalign b/src/libcxx/include/cstdalign
@@ -0,0 +1,9 @@
+// -*- C++ -*-
+#ifndef _EZCXX_CSTDALIGN
+#define _EZCXX_CSTDALIGN
+
+#include <stdalign.h>
+
+#pragma clang system_header
+
+#endif // _EZCXX_CSTDALIGN
diff --git a/src/libcxx/include/cstdbool b/src/libcxx/include/cstdbool
@@ -0,0 +1,9 @@
+// -*- C++ -*-
+#ifndef _EZCXX_CSTDBOOL
+#define _EZCXX_CSTDBOOL
+
+#include <stdbool.h>
+
+#pragma clang system_header
+
+#endif // _EZCXX_CSTDBOOL
diff --git a/src/libcxx/include/cstdint b/src/libcxx/include/cstdint
@@ -11,12 +11,14 @@ using::int8_t;
 using::int16_t;
 using::int24_t;
 using::int32_t;
+using::int48_t;
 using::int64_t;
 
 using::uint8_t;
 using::uint16_t;
 using::uint24_t;
 using::uint32_t;
+using::uint48_t;
 using::uint64_t;
 
 using::int_least8_t;
diff --git a/src/libcxx/include/cstdlib b/src/libcxx/include/cstdlib
@@ -15,10 +15,13 @@ using ::free;
 using ::atof;
 using ::atoi;
 using ::atol;
+using ::atoll;
 using ::strtof;
 using ::strtod;
 using ::strtol;
+using ::strtoll;
 using ::strtoul;
+using ::strtoull;
 
 using ::srand;
 using ::rand;
@@ -36,8 +39,16 @@ using ::_Exit;
 
 using ::abs;
 using ::labs;
+using ::llabs;
+inline constexpr long abs(long __x) { return labs(__x); }
+inline constexpr long long abs(long long __x) { return llabs(__x); }
+
 using ::div;
 using ::ldiv;
+using ::lldiv;
+inline constexpr ldiv_t div(long __x, long __y) { return ldiv(__x, __y); }
+inline constexpr lldiv_t div(long long __x, long long __y) { return lldiv(__x, __y); }
+
 } // namespace std
 
 #endif // _EZCXX_CSTDLIB
diff --git a/src/libcxx/include/ctime b/src/libcxx/include/ctime
@@ -0,0 +1,25 @@
+// -*- C++ -*-
+#ifndef _EZCXX_CTIME
+#define _EZCXX_CTIME
+
+#include <time.h>
+
+#pragma clang system_header
+
+namespace std {
+using ::clock_t;
+using ::time_t;
+using ::tm;
+
+using ::clock;
+using ::difftime;
+using ::mktime;
+using ::time;
+using ::localtime;
+using ::gmtime;
+using ::asctime;
+using ::ctime;
+using ::strftime;
+} // namespace std
+
+#endif // _EZCXX_CTIME

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,6 @@ int feupdateenv(const fenv_t *);`
`83`	`83`	`}`
`84`	`84`	`#endif`
`85`	`85`
`86`		`-#endif`
	`86`	`+#endif /* _FENV_P_ONLY */`
`87`	`87`
`88`		`-#endif`
	`88`	`+#endif /* _FENV_P */`
Original file line number	Diff line number	Diff line change
`@@ -301,4 +301,4 @@ long double truncl(long double);`
`301`	`301`	`}`
`302`	`302`	`#endif`
`303`	`303`
`304`		`-#endif`
	`304`	`+#endif /* _MATH_H */`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@ void longjmp(jmp_buf env, int val) __attribute__((noreturn));`
`12`	`12`
`13`	`13`	`__END_DECLS`
`14`	`14`
`15`		`-#endif`
	`15`	`+#endif /* _SETJMP_H */`