X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=arch%2Fx86_64%2Fbits%2Falltypes.h.sh;h=bc9a3cc0139c809f8e24165ffd846cbd436eaa03;hp=19843bd388c05b5c9c1db3682b1e1c8a0896800f;hb=da1442c9a8c58f8ad85a1bd96007f60bc372d157;hpb=cac7d837ccc35b7e80d8f1eb7338f8e9d8b1b2d8

diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh
index 19843bd3..bc9a3cc0 100755
--- a/arch/x86_64/bits/alltypes.h.sh
+++ b/arch/x86_64/bits/alltypes.h.sh
@@ -21,15 +21,17 @@ TYPEDEF long ssize_t;
 TYPEDEF long ptrdiff_t;
 TYPEDEF __builtin_va_list va_list;
 
+#ifndef __cplusplus
 TYPEDEF int wchar_t;
+#endif
 TYPEDEF int wint_t;
-TYPEDEF int wctrans_t;
-TYPEDEF int wctype_t;
+TYPEDEF const int * wctrans_t;
+TYPEDEF unsigned long wctype_t;
 
-TYPEDEF char      int8_t;
-TYPEDEF short     int16_t;
-TYPEDEF int       int32_t;
-TYPEDEF long      int64_t;
+TYPEDEF signed char int8_t;
+TYPEDEF short       int16_t;
+TYPEDEF int         int32_t;
+TYPEDEF long        int64_t;
 
 TYPEDEF unsigned char      uint8_t;
 TYPEDEF unsigned short     uint16_t;
@@ -53,6 +55,9 @@ TYPEDEF uint64_t           uint_fast64_t;
 TYPEDEF long          intptr_t;
 TYPEDEF unsigned long uintptr_t;
 
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+
 TYPEDEF long time_t;
 TYPEDEF long suseconds_t;
 STRUCT timeval { time_t tv_sec; long tv_usec; };