Move intmax_t and uintmax_t type declarations to sys/_stdint.h to give

it an exposure needed for use in sys/sysctl.h.

Suggested by:	bde
Sponsored by:	The FreeBSD Foundation
MFC after:	2 weeks

diff --git a/sys/sys/_stdint.h b/sys/sys/_stdint.h
index d0f92493b052aa252691243198de0c3c0c9f8223..a0fe0ad1fa5b1ecb0218a87ac996ca5976c769de 100644 (file)
--- a/sys/sys/_stdint.h
+++ b/sys/sys/_stdint.h
@@ -78,5 +78,13 @@ typedef      __intptr_t              intptr_t;
 typedef        __uintptr_t             uintptr_t;
 #define        _UINTPTR_T_DECLARED
 #endif
+#ifndef _INTMAX_T_DECLARED
+typedef        __intmax_t              intmax_t;
+#define        _INTMAX_T_DECLARED
+#endif
+#ifndef _UINTMAX_T_DECLARED
+typedef        __uintmax_t             uintmax_t;
+#define        _UINTMAX_T_DECLARED
+#endif
 
 #endif /* !_SYS__STDINT_H_ */

diff --git a/sys/sys/stdint.h b/sys/sys/stdint.h
index 762e8795496afa1647ae653a37d1820d5f380aa0..ec3698be88b1903271a68a8c621146eb4ea4f225 100644 (file)
--- a/sys/sys/stdint.h
+++ b/sys/sys/stdint.h
@@ -55,15 +55,6 @@ typedef      __uint_fast16_t         uint_fast16_t;
 typedef        __uint_fast32_t         uint_fast32_t;
 typedef        __uint_fast64_t         uint_fast64_t;
 
-#ifndef _INTMAX_T_DECLARED
-typedef        __intmax_t              intmax_t;
-#define        _INTMAX_T_DECLARED
-#endif
-#ifndef _UINTMAX_T_DECLARED
-typedef        __uintmax_t             uintmax_t;
-#define        _UINTMAX_T_DECLARED
-#endif
-
 /* GNU and Darwin define this and people seem to think it's portable */
 #if defined(UINTPTR_MAX) && defined(UINT64_MAX) && (UINTPTR_MAX == UINT64_MAX)
 #define        __WORDSIZE              64