1 |
--- OpenSP-1.5.2/configure.in.multilib 2005-12-23 14:15:21.000000000 +0000 |
2 |
+++ OpenSP-1.5.2/configure.in 2006-06-13 13:36:49.000000000 +0100 |
3 |
@@ -90,7 +90,7 @@ |
4 |
#define SP_SIZEOF_BOOL_1 |
5 |
#endif |
6 |
|
7 |
-#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT) |
8 |
+#if (WCHAR_MAX == SHRT_MAX) |
9 |
#define SP_WCHAR_T_USHORT |
10 |
#endif |
11 |
|
12 |
--- OpenSP-1.5.2/lib/parser_inst.cxx.multilib 2005-07-21 16:33:41.000000000 +0100 |
13 |
+++ OpenSP-1.5.2/lib/parser_inst.cxx 2006-06-13 13:36:49.000000000 +0100 |
14 |
@@ -9,6 +9,7 @@ |
15 |
// Copyright (c) 1994 James Clark |
16 |
// See the file COPYING for copying permission. |
17 |
|
18 |
+#include <limits.h> |
19 |
#include "splib.h" |
20 |
|
21 |
#ifdef SP_MANUAL_INST |
22 |
@@ -1338,7 +1339,7 @@ |
23 |
#endif |
24 |
#endif |
25 |
// we really just want to test if size_t == unsigned int |
26 |
-#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT) |
27 |
+#if INT_MAX != SSIZE_MAX |
28 |
#ifdef __DECCXX |
29 |
#pragma define_template Vector<unsigned int> |
30 |
#else |
31 |
--- OpenSP-1.5.2/lib/parser_inst.m4.multilib 2005-05-14 10:17:35.000000000 +0100 |
32 |
+++ OpenSP-1.5.2/lib/parser_inst.m4 2006-06-13 13:36:49.000000000 +0100 |
33 |
@@ -1,6 +1,7 @@ |
34 |
// Copyright (c) 1994 James Clark |
35 |
// See the file COPYING for copying permission. |
36 |
|
37 |
+#include <limits.h> |
38 |
#include "splib.h" |
39 |
|
40 |
#ifdef SP_MANUAL_INST |
41 |
@@ -166,7 +167,7 @@ |
42 |
__instantiate(Vector<LeafContentToken*>) |
43 |
__instantiate(Vector<size_t>) |
44 |
// we really just want to test if size_t == unsigned int |
45 |
-#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT) |
46 |
+#if INT_MAX != SSIZE_MAX |
47 |
__instantiate(Vector<unsigned int>) |
48 |
#endif |
49 |
|
50 |
--- OpenSP-1.5.2/config.h.in.multilib 2005-11-05 09:43:42.000000000 +0000 |
51 |
+++ OpenSP-1.5.2/config.h.in 2006-06-13 13:41:45.000000000 +0100 |
52 |
@@ -1,5 +1,7 @@ |
53 |
/* config.h.in. Generated from configure.in by autoheader. */ |
54 |
|
55 |
+#include <limits.h> |
56 |
+ |
57 |
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP |
58 |
systems. This function is required for `alloca.c' support on those systems. |
59 |
*/ |
60 |
@@ -333,22 +335,6 @@ |
61 |
/* The size of a `bool', as computed by sizeof. */ |
62 |
#undef SIZEOF_BOOL |
63 |
|
64 |
-/* The size of a `size_t', as computed by sizeof. */ |
65 |
-#undef SIZEOF_SIZE_T |
66 |
- |
67 |
-/* The size of a `unsigned int', as computed by sizeof. */ |
68 |
-#undef SIZEOF_UNSIGNED_INT |
69 |
- |
70 |
-/* The size of a `unsigned short', as computed by sizeof. */ |
71 |
-#undef SIZEOF_UNSIGNED_SHORT |
72 |
- |
73 |
-/* The size of a `wchar_t', as computed by sizeof. */ |
74 |
-#undef SIZEOF_WCHAR_T |
75 |
- |
76 |
-/* Define as the maximum value of type 'size_t', if the system doesn't define |
77 |
- it. */ |
78 |
-#undef SIZE_MAX |
79 |
- |
80 |
/* define this if h_errno should be declared extern int */ |
81 |
#undef SP_DECLARE_H_ERRNO |
82 |
|
83 |
@@ -503,7 +489,7 @@ |
84 |
#define SP_SIZEOF_BOOL_1 |
85 |
#endif |
86 |
|
87 |
-#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT) |
88 |
+#if (WCHAR_MAX == SHRT_MAX) |
89 |
#define SP_WCHAR_T_USHORT |
90 |
#endif |
91 |
|