|
1 --- stdcxx-4.2.1/etc/config/src/SIZE_T.cpp 2008-04-24 20:25:44.000000000 -0400 |
|
2 +++ stdcxx-4.2.1/etc/config/src/SIZE_T.cpp 2011-01-13 16:03:35.112939953 -0500 |
|
3 @@ -28,6 +28,9 @@ |
|
4 #include <stdio.h> |
|
5 #include <stdlib.h> // for RAND_MAX |
|
6 #include <time.h> // for CLOCKS_PER_SEC |
|
7 +#include <stdint.h> |
|
8 +#include <sys/types.h> |
|
9 +#include <limits.h> |
|
10 |
|
11 #ifndef _RWSTD_NO_WCTYPE_H |
|
12 # include <wctype.h> // for WEOF |
|
13 @@ -54,6 +57,17 @@ |
|
14 size_t size = 0; // unsigned integral type |
|
15 time_t tim = 0; // arithmetic type |
|
16 |
|
17 +#if defined(__SUNPRO_CC) |
|
18 + printf ("#define _RWSTD_CLOCK_T %s\n", "clock_t"); |
|
19 + printf ("#define _RWSTD_PTRDIFF_T %s\n", "ptrdiff_t"); |
|
20 + printf ("#define _RWSTD_SIZE_T %s\n", "size_t"); |
|
21 + printf ("#define _RWSTD_SSIZE_T %s\n", "ssize_t"); |
|
22 + |
|
23 + printf ("#define _RWSTD_SIZE_MAX SIZE_MAX\n"); |
|
24 + printf ("#define _RWSTD_PTRDIFF_MIN PTRDIFF_MIN\n"); |
|
25 + printf ("#define _RWSTD_PTRDIFF_MAX PTRDIFF_MAX\n"); |
|
26 + printf ("#define _RWSTD_TIME_T %s\n", "time_t"); |
|
27 +#else |
|
28 printf ("#define _RWSTD_CLOCK_T %s\n", type_name (clk)); |
|
29 printf ("#define _RWSTD_PTRDIFF_T %s\n", type_name (diff)); |
|
30 printf ("#define _RWSTD_SIZE_T %s\n", type_name (size)); |
|
31 @@ -69,6 +83,7 @@ |
|
32 |
|
33 |
|
34 printf ("#define _RWSTD_TIME_T %s\n", type_name (tim)); |
|
35 +#endif // __SUNPRO_CC |
|
36 |
|
37 #if defined (CLOCKS_PER_SEC) |
|
38 printf ("#define _RWSTD_CLOCKS_PER_SEC %d\n", CLOCKS_PER_SEC); |
|
39 |
|
40 #========================================================# |
|
41 |
|
42 --- stdcxx-4.2.1/etc/config/src/SIG_ATOMIC_T.cpp 2008-04-24 20:25:44.000000000 -0400 |
|
43 +++ stdcxx-4.2.1/etc/config/src/SIG_ATOMIC_T.cpp 2011-01-13 16:41:25.550940101 -0500 |
|
44 @@ -24,6 +24,7 @@ |
|
45 |
|
46 #include <signal.h> |
|
47 #include <stdio.h> |
|
48 +#include <stdint.h> |
|
49 |
|
50 #include "config.h" |
|
51 |
|
52 @@ -83,6 +84,11 @@ |
|
53 |
|
54 sig_atomic_t atomic = 0; |
|
55 const char* const tname = type_name (atomic); |
|
56 +#if defined(__SUNPRO_CC) |
|
57 + printf ("#define _RWSTD_SIG_ATOMIC_T %s\n", "sig_atomic_t"); |
|
58 + printf ("#define _RWSTD_SIG_ATOMIC_MIN SIG_ATOMIC_MIN\n"); |
|
59 + printf ("#define _RWSTD_SIG_ATOMIC_MAX SIG_ATOMIC_MAX\n"); |
|
60 +#else |
|
61 printf ("#define _RWSTD_SIG_ATOMIC_T %s\n", tname); |
|
62 |
|
63 // compute the type's minimum and maximum |
|
64 @@ -91,6 +97,8 @@ |
|
65 printf ("#define _RWSTD_SIG_ATOMIC_MIN _RWSTD_%s_MIN\n" |
|
66 "#define _RWSTD_SIG_ATOMIC_MAX _RWSTD_%s_MAX\n", |
|
67 symbol, symbol); |
|
68 +#endif |
|
69 |
|
70 return 0; |
|
71 } |
|
72 + |
|
73 |
|
74 #========================================================# |
|
75 |
|
76 --- stdcxx-4.2.1/etc/config/src/UNISTD_DECL.cpp 2008-04-24 20:25:44.000000000 -0400 |
|
77 +++ stdcxx-4.2.1/etc/config/src/UNISTD_DECL.cpp 2011-01-13 16:09:17.619688853 -0500 |
|
78 @@ -34,6 +34,8 @@ |
|
79 # include <unistd.h> |
|
80 #endif // _WIN32 || _WIN64 |
|
81 |
|
82 +#include <stdint.h> |
|
83 + |
|
84 // Windows defines the equivalent SSIZE_T in the platform SDK |
|
85 // as the signed equivalent of size_t which is defined as long |
|
86 // on WIN32 and long long/__int64 on WIN64 |
|
87 @@ -140,11 +142,16 @@ |
|
88 { |
|
89 print_macros (); |
|
90 |
|
91 +#if defined(__SUNPRO_CC) |
|
92 + printf ("#define _RWSTD_OFF_T off_t\n"); |
|
93 + printf ("#define _RWSTD_SSIZE_T ssize_t\n"); |
|
94 +#else |
|
95 off_t off = 0; |
|
96 printf ("#define _RWSTD_OFF_T %s // off_t\n", off_t_name (off)); |
|
97 |
|
98 ssize_t s = 0; |
|
99 printf ("#define _RWSTD_SSIZE_T %s // ssize_t\n", ssize_t_name (s)); |
|
100 +#endif |
|
101 |
|
102 return 0; |
|
103 } |
|
104 |
|
105 #========================================================# |
|
106 |
|
107 --- stdcxx-4.2.1/etc/config/src/types.h 2008-04-24 20:25:44.000000000 -0400 |
|
108 +++ stdcxx-4.2.1/etc/config/src/types.h 2011-01-13 16:21:37.514713711 -0500 |
|
109 @@ -38,7 +38,11 @@ |
|
110 DEFINE_TYPE_HELPER (unsigned short, "USHRT"); |
|
111 |
|
112 DEFINE_TYPE_HELPER (int, "INT"); |
|
113 +#if defined(__SUNPRO_CC) |
|
114 +DEFINE_TYPE_HELPER (unsigned int, "UINT"); |
|
115 +#else |
|
116 DEFINE_TYPE_HELPER (unsigned, "UINT"); |
|
117 +#endif |
|
118 |
|
119 DEFINE_TYPE_HELPER (long, "LONG"); |
|
120 DEFINE_TYPE_HELPER (unsigned long, "ULONG"); |
|
121 |
|
122 #========================================================# |
|
123 |