summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2015-11-21 16:21:27 +0000
committerkib <kib@FreeBSD.org>2015-11-21 16:21:27 +0000
commitb5ae3e30b3f29ccd21120c954b01b3cae19d4b89 (patch)
tree53535e54ede72ca33a07d155187456e24c75132f
parent9aec66905fd79577d0e13907c4aff0a92b0e8b27 (diff)
downloadFreeBSD-src-b5ae3e30b3f29ccd21120c954b01b3cae19d4b89.zip
FreeBSD-src-b5ae3e30b3f29ccd21120c954b01b3cae19d4b89.tar.gz
MFC r290492:
Move intmax_t and uintmax_t type declarations to sys/_stdint.h.
-rw-r--r--sys/sys/_stdint.h8
-rw-r--r--sys/sys/stdint.h9
2 files changed, 8 insertions, 9 deletions
diff --git a/sys/sys/_stdint.h b/sys/sys/_stdint.h
index d0f9249..a0fe0ad 100644
--- 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 762e879..ec3698b 100644
--- 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
OpenPOWER on IntegriCloud