X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fstdint.h;h=7628404881d7351afe2ce69efed1b60e46dfb0d9;hp=540066780166d7a4435ebdebf46d97e707925409;hb=1ab59de81e94e7802f85d314a709f8350a0e9b65;hpb=a591e0383a0a31ac94541846796b93fedc63a0c4

diff --git a/include/stdint.h b/include/stdint.h
index 54006678..76284048 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -24,6 +24,9 @@
 #define __NEED_intptr_t
 #define __NEED_uintptr_t
 
+#define __NEED_intmax_t
+#define __NEED_uintmax_t
+
 #include <bits/alltypes.h>
 
 typedef int8_t  int_least8_t;
@@ -36,25 +39,20 @@ typedef uint16_t uint_least16_t;
 typedef uint32_t uint_least32_t;
 typedef uint64_t uint_least64_t;
 
-typedef long long          intmax_t;
-typedef unsigned long long uintmax_t;
-
-#if !defined __cplusplus || defined __STDC_LIMIT_MACROS
-
 #define INT8_MIN   (-1-0x7f)
 #define INT16_MIN  (-1-0x7fff)
 #define INT32_MIN  (-1-0x7fffffff)
-#define INT64_MIN  (-1-0x7fffffffffffffffLL)
+#define INT64_MIN  (-1-0x7fffffffffffffff)
 
 #define INT8_MAX   (0x7f)
 #define INT16_MAX  (0x7fff)
 #define INT32_MAX  (0x7fffffff)
-#define INT64_MAX  (0x7fffffffffffffffLL)
+#define INT64_MAX  (0x7fffffffffffffff)
 
 #define UINT8_MAX  (0xff)
 #define UINT16_MAX (0xffff)
 #define UINT32_MAX (0xffffffff)
-#define UINT64_MAX (0xffffffffffffffffULL)
+#define UINT64_MAX (0xffffffffffffffff)
 
 #define INT_LEAST8_MIN   INT8_MIN
 #define INT_LEAST16_MIN  INT16_MIN
@@ -78,26 +76,34 @@ typedef unsigned long long uintmax_t;
 #define WINT_MIN INT32_MIN
 #define WINT_MAX INT32_MAX
 
-#include <bits/wchar.h>
-#include <bits/stdint.h>
-
+#if L'\0'-1 > 0
+#define WCHAR_MAX (0xffffffffu+L'\0')
+#define WCHAR_MIN (0+L'\0')
+#else
+#define WCHAR_MAX (0x7fffffff+L'\0')
+#define WCHAR_MIN (-1-0x7fffffff+L'\0')
 #endif
 
-#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS
+#include <bits/stdint.h>
 
 #define INT8_C(c)  c
 #define INT16_C(c) c
 #define INT32_C(c) c
-#define INT64_C(c) c ## LL
 
-#define UINT8_C(c)  c ## U
-#define UINT16_C(c) c ## U
+#define UINT8_C(c)  c
+#define UINT16_C(c) c
 #define UINT32_C(c) c ## U
-#define UINT64_C(c) c ## ULL
 
+#if UINTPTR_MAX == UINT64_MAX
+#define INT64_C(c) c ## L
+#define UINT64_C(c) c ## UL
+#define INTMAX_C(c)  c ## L
+#define UINTMAX_C(c) c ## UL
+#else
+#define INT64_C(c) c ## LL
+#define UINT64_C(c) c ## ULL
 #define INTMAX_C(c)  c ## LL
 #define UINTMAX_C(c) c ## ULL
-
 #endif
 
 #endif