Page MenuHomeFreeBSD
Files F168382961

D56746.id176897.diff
No OneTemporary
Actions

D56746.id176897.diff
View Options

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20260430: Provide stdint.h macros unconditionally
+OLD_FILES+=usr/include/c++/v1/stdint.h
+
# 20260402: posix_spawn_file_actions_addchdir lost _np suffix
OLD_FILES+=usr/share/man/man3/posix_spawn_file_actions_addchdir_np.3.gz
OLD_FILES+=usr/share/man/man3/posix_spawn_file_actions_addfchdir_np.3.gz
diff --git a/contrib/llvm-project/libcxx/include/cstdint b/contrib/llvm-project/libcxx/include/cstdint
--- a/contrib/llvm-project/libcxx/include/cstdint
+++ b/contrib/llvm-project/libcxx/include/cstdint
@@ -144,14 +144,6 @@
#include <stdint.h>
-#ifndef _LIBCPP_STDINT_H
-# error <cstdint> tried including <stdint.h> but didn't find libc++'s <stdint.h> header. \
- This usually means that your header search paths are not configured properly. \
- The header search paths should contain the C++ Standard Library headers before \
- any C Standard Library, and you are probably using compiler flags that make that \
- not be the case.
-#endif
-
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
#endif
diff --git a/contrib/llvm-project/libcxx/include/module.modulemap b/contrib/llvm-project/libcxx/include/module.modulemap
--- a/contrib/llvm-project/libcxx/include/module.modulemap
+++ b/contrib/llvm-project/libcxx/include/module.modulemap
@@ -478,10 +478,6 @@
textual header "stddef.h"
export *
}
-module std_stdint_h [system] {
- header "stdint.h"
- export *
-}
module std_stdio_h [system] {
// <stdio.h>'s __need_* macros require textual inclusion.
textual header "stdio.h"
diff --git a/contrib/llvm-project/libcxx/include/stdint.h b/contrib/llvm-project/libcxx/include/stdint.h
deleted file mode 100644
--- a/contrib/llvm-project/libcxx/include/stdint.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_STDINT_H
-// AIX system headers need stdint.h to be re-enterable while _STD_TYPES_T
-// is defined until an inclusion of it without _STD_TYPES_T occurs, in which
-// case the header guard macro is defined.
-#if !defined(_AIX) || !defined(_STD_TYPES_T)
-# define _LIBCPP_STDINT_H
-#endif // _STD_TYPES_T
-
-/*
- stdint.h synopsis
-
-Macros:
-
- INT8_MIN
- INT16_MIN
- INT32_MIN
- INT64_MIN
-
- INT8_MAX
- INT16_MAX
- INT32_MAX
- INT64_MAX
-
- UINT8_MAX
- UINT16_MAX
- UINT32_MAX
- UINT64_MAX
-
- INT_LEAST8_MIN
- INT_LEAST16_MIN
- INT_LEAST32_MIN
- INT_LEAST64_MIN
-
- INT_LEAST8_MAX
- INT_LEAST16_MAX
- INT_LEAST32_MAX
- INT_LEAST64_MAX
-
- UINT_LEAST8_MAX
- UINT_LEAST16_MAX
- UINT_LEAST32_MAX
- UINT_LEAST64_MAX
-
- INT_FAST8_MIN
- INT_FAST16_MIN
- INT_FAST32_MIN
- INT_FAST64_MIN
-
- INT_FAST8_MAX
- INT_FAST16_MAX
- INT_FAST32_MAX
- INT_FAST64_MAX
-
- UINT_FAST8_MAX
- UINT_FAST16_MAX
- UINT_FAST32_MAX
- UINT_FAST64_MAX
-
- INTPTR_MIN
- INTPTR_MAX
- UINTPTR_MAX
-
- INTMAX_MIN
- INTMAX_MAX
-
- UINTMAX_MAX
-
- PTRDIFF_MIN
- PTRDIFF_MAX
-
- SIG_ATOMIC_MIN
- SIG_ATOMIC_MAX
-
- SIZE_MAX
-
- WCHAR_MIN
- WCHAR_MAX
-
- WINT_MIN
- WINT_MAX
-
- INT8_C(value)
- INT16_C(value)
- INT32_C(value)
- INT64_C(value)
-
- UINT8_C(value)
- UINT16_C(value)
- UINT32_C(value)
- UINT64_C(value)
-
- INTMAX_C(value)
- UINTMAX_C(value)
-
-*/
-
-#include <__config>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-# pragma GCC system_header
-#endif
-
-/* C99 stdlib (e.g. glibc < 2.18) does not provide macros needed
- for C++11 unless __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS
- are defined
-*/
-#if defined(__cplusplus) && !defined(__STDC_LIMIT_MACROS)
-# define __STDC_LIMIT_MACROS
-#endif
-#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS)
-# define __STDC_CONSTANT_MACROS
-#endif
-
-#if __has_include_next(<stdint.h>)
-# include_next <stdint.h>
-#endif
-
-#endif // _LIBCPP_STDINT_H
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -229,7 +229,6 @@
STD_HEADERS+= stdbool.h
STD_HEADERS+= stddef.h
STD_HEADERS+= stdexcept
-STD_HEADERS+= stdint.h
STD_HEADERS+= stdio.h
STD_HEADERS+= stdlib.h
STD_HEADERS+= stop_token
diff --git a/sys/arm/include/_stdint.h b/sys/arm/include/_stdint.h
--- a/sys/arm/include/_stdint.h
+++ b/sys/arm/include/_stdint.h
@@ -33,8 +33,6 @@
#ifndef _MACHINE__STDINT_H_
#define _MACHINE__STDINT_H_
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
-
#define INT8_C(c) (c)
#define INT16_C(c) (c)
#define INT32_C(c) (c)
@@ -48,10 +46,6 @@
#define INTMAX_C(c) INT64_C(c)
#define UINTMAX_C(c) UINT64_C(c)
-#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
-
/*
* ISO/IEC 9899:1999
* 7.18.2.1 Limits of exact-width integer types
@@ -176,6 +170,4 @@
#define WINT_WIDTH INT32_WIDTH
#endif /* __ISO_C_VISIBLE >= 2023 */
-#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */
-
#endif /* !_MACHINE__STDINT_H_ */
diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h
--- a/sys/powerpc/include/_stdint.h
+++ b/sys/powerpc/include/_stdint.h
@@ -40,8 +40,6 @@
#ifndef _MACHINE__STDINT_H_
#define _MACHINE__STDINT_H_
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
-
#define INT8_C(c) (c)
#define INT16_C(c) (c)
#define INT32_C(c) (c)
@@ -61,10 +59,6 @@
#define INTMAX_C(c) INT64_C(c)
#define UINTMAX_C(c) UINT64_C(c)
-#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
-
#ifndef __INT64_C
#ifdef __LP64__
#define __INT64_C(c) (c ## L)
@@ -173,14 +167,14 @@
#ifdef __LP64__
/* Limits of ptrdiff_t. */
-#define PTRDIFF_MIN INT64_MIN
+#define PTRDIFF_MIN INT64_MIN
#define PTRDIFF_MAX INT64_MAX
/* Limit of size_t. */
#define SIZE_MAX UINT64_MAX
#else
/* Limits of ptrdiff_t. */
-#define PTRDIFF_MIN INT32_MIN
+#define PTRDIFF_MIN INT32_MIN
#define PTRDIFF_MAX INT32_MAX
/* Limit of size_t. */
@@ -223,6 +217,4 @@
#define WINT_WIDTH INT32_WIDTH
#endif /* __ISO_C_VISIBLE >= 2023 */
-#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */
-
#endif /* !_MACHINE__STDINT_H_ */
diff --git a/sys/riscv/include/_stdint.h b/sys/riscv/include/_stdint.h
--- a/sys/riscv/include/_stdint.h
+++ b/sys/riscv/include/_stdint.h
@@ -31,8 +31,6 @@
#ifndef _MACHINE__STDINT_H_
#define _MACHINE__STDINT_H_
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
-
#define INT8_C(c) (c)
#define INT16_C(c) (c)
#define INT32_C(c) (c)
@@ -46,10 +44,6 @@
#define INTMAX_C(c) INT64_C(c)
#define UINTMAX_C(c) UINT64_C(c)
-#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
-
/*
* ISO/IEC 9899:1999
* 7.18.2.1 Limits of exact-width integer types
@@ -137,7 +131,7 @@
* 7.18.3 Limits of other integer types
*/
/* Limits of ptrdiff_t. */
-#define PTRDIFF_MIN INT64_MIN
+#define PTRDIFF_MIN INT64_MIN
#define PTRDIFF_MAX INT64_MAX
/* Limits of sig_atomic_t. */
@@ -174,6 +168,4 @@
#define WINT_WIDTH INT32_WIDTH
#endif /* __ISO_C_VISIBLE >= 2023 */
-#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */
-
#endif /* !_MACHINE__STDINT_H_ */
diff --git a/sys/x86/include/_stdint.h b/sys/x86/include/_stdint.h
--- a/sys/x86/include/_stdint.h
+++ b/sys/x86/include/_stdint.h
@@ -40,8 +40,6 @@
#ifndef _MACHINE__STDINT_H_
#define _MACHINE__STDINT_H_
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
-
#define INT8_C(c) (c)
#define INT16_C(c) (c)
#define INT32_C(c) (c)
@@ -61,10 +59,6 @@
#define INTMAX_C(c) INT64_C(c)
#define UINTMAX_C(c) UINT64_C(c)
-#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
-
/*
* ISO/IEC 9899:1999
* 7.18.2.1 Limits of exact-width integer types
@@ -163,7 +157,7 @@
*/
#ifdef __LP64__
/* Limits of ptrdiff_t. */
-#define PTRDIFF_MIN INT64_MIN
+#define PTRDIFF_MIN INT64_MIN
#define PTRDIFF_MAX INT64_MAX
/* Limits of sig_atomic_t. */
@@ -217,6 +211,4 @@
#define WINT_WIDTH INT32_WIDTH
#endif /* __ISO_C_VISIBLE >= 2023 */
-#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */
-
#endif /* !_MACHINE__STDINT_H_ */

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 28, 9:54 PM (6 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37485144
Default Alt Text
D56746.id176897.diff (8 KB)

Event Timeline