Mercurial > illumos > illumos-gate
changeset 12785:5d30bc2ad659
10 64-bit binaries busted
Reviewed by: estseg@gmail.com
Approved by: gdamore@nexenta.com
| author | Garrett D'Amore <garrett@nexenta.com> |
|---|---|
| date | Sun, 01 Aug 2010 17:20:38 -0700 |
| parents | 1c17fa7de7ee |
| children | 2ef7c75e9bcd |
| files | usr/src/lib/libc/inc/lint.h usr/src/lib/libc/inc/mse.h usr/src/lib/libc/port/locale/_ctype.h usr/src/lib/libc/port/locale/iswctype.c usr/src/lib/libc/port/locale/ldpart.c usr/src/lib/libc/port/locale/mbftowc.c usr/src/lib/libc/port/locale/regcomp.c usr/src/lib/libc/port/locale/regex2.h usr/src/lib/libc/port/locale/runetype.c usr/src/lib/libc/port/locale/runetype.h usr/src/lib/libc/port/locale/strfmon.c |
| diffstat | 11 files changed, 22 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/lib/libc/inc/lint.h Fri Jul 30 21:32:33 2010 -0700 +++ b/usr/src/lib/libc/inc/lint.h Sun Aug 01 17:20:38 2010 -0700 @@ -31,6 +31,9 @@ extern "C" { #endif +/* we need the following to pick up _LP64 */ +#include <sys/feature_tests.h> + /* * We must include "lint.h" as the first #include in all libc source files * for the purpose of running lint over libc, else lint errors occur due to
--- a/usr/src/lib/libc/inc/mse.h Fri Jul 30 21:32:33 2010 -0700 +++ b/usr/src/lib/libc/inc/mse.h Sun Aug 01 17:20:38 2010 -0700 @@ -32,6 +32,7 @@ #define _MSE_H #include "lint.h" +#include "file64.h" #include <stdio.h> #include <wchar.h> #include <string.h>
--- a/usr/src/lib/libc/port/locale/_ctype.h Fri Jul 30 21:32:33 2010 -0700 +++ b/usr/src/lib/libc/port/locale/_ctype.h Sun Aug 01 17:20:38 2010 -0700 @@ -83,6 +83,6 @@ #define _CTYPE_SWM 0xe0000000U /* Mask for screen width data */ #define _CTYPE_SWS 30 /* Bits to shift to get width */ -unsigned long ___runetype(int); +unsigned int ___runetype(int); #endif /* !__CTYPE_H_ */
--- a/usr/src/lib/libc/port/locale/iswctype.c Fri Jul 30 21:32:33 2010 -0700 +++ b/usr/src/lib/libc/port/locale/iswctype.c Sun Aug 01 17:20:38 2010 -0700 @@ -57,9 +57,9 @@ */ static int -__istype(wint_t c, unsigned long f) +__istype(wint_t c, unsigned int f) { - unsigned long rt; + unsigned int rt; /* Fast path for single byte locales */ if (c < 0 || c >= _CACHED_RUNES) @@ -70,9 +70,9 @@ } static int -__isctype(wint_t c, unsigned long f) +__isctype(wint_t c, unsigned int f) { - unsigned long rt; + unsigned int rt; /* Fast path for single byte locales */ if (c < 0 || c >= _CACHED_RUNES) @@ -86,14 +86,14 @@ int iswctype(wint_t wc, wctype_t class) { - return (__istype(wc, (unsigned long)class)); + return (__istype(wc, class)); } #undef _iswctype unsigned _iswctype(wchar_t wc, int class) { - return (__istype((wint_t)wc, (unsigned long)class)); + return (__istype((wint_t)wc, (unsigned int)class)); } #undef iswalnum
--- a/usr/src/lib/libc/port/locale/ldpart.c Fri Jul 30 21:32:33 2010 -0700 +++ b/usr/src/lib/libc/port/locale/ldpart.c Sun Aug 01 17:20:38 2010 -0700 @@ -30,6 +30,7 @@ */ #include "lint.h" +#include "file64.h" #include <sys/types.h> #include <sys/stat.h> #include <errno.h>
--- a/usr/src/lib/libc/port/locale/mbftowc.c Fri Jul 30 21:32:33 2010 -0700 +++ b/usr/src/lib/libc/port/locale/mbftowc.c Sun Aug 01 17:20:38 2010 -0700 @@ -51,7 +51,7 @@ int c; mbstate_t mbs; char *start = s; - int cons = 0; + size_t cons = 0; for (;;) { c = peek(); @@ -65,11 +65,11 @@ (void) memset(&mbs, 0, sizeof (mbs)); cons = mbrtowc(wc, start, s - start, &mbs); - if (cons >= 0) { + if ((int)cons >= 0) { /* fully translated character */ return (cons); } - if (cons == -2) { + if (cons == (size_t)-2) { /* incomplete, recycle */ continue; }
--- a/usr/src/lib/libc/port/locale/regcomp.c Fri Jul 30 21:32:33 2010 -0700 +++ b/usr/src/lib/libc/port/locale/regcomp.c Sun Aug 01 17:20:38 2010 -0700 @@ -1282,7 +1282,7 @@ } } - memmove((char *)&p->strip[pos+1], (char *)&p->strip[pos], + (void) memmove((char *)&p->strip[pos+1], (char *)&p->strip[pos], (HERE()-pos-1)*sizeof (sop)); p->strip[pos] = s; }
--- a/usr/src/lib/libc/port/locale/regex2.h Fri Jul 30 21:32:33 2010 -0700 +++ b/usr/src/lib/libc/port/locale/regex2.h Sun Aug 01 17:20:38 2010 -0700 @@ -72,8 +72,8 @@ * In state representations, an operator's bit is on to signify a state * immediately *preceding* "execution" of that operator. */ -typedef unsigned long sop; /* strip operator */ -typedef long sopno; +typedef unsigned int sop; /* strip operator */ +typedef int sopno; #define OPRMASK 0xf8000000U #define OPDMASK 0x07ffffffU #define OPSHIFT ((unsigned)27)
--- a/usr/src/lib/libc/port/locale/runetype.c Fri Jul 30 21:32:33 2010 -0700 +++ b/usr/src/lib/libc/port/locale/runetype.c Sun Aug 01 17:20:38 2010 -0700 @@ -40,7 +40,7 @@ #include <stdio.h> #include "runetype.h" -unsigned long +unsigned int ___runetype(__ct_rune_t c) { size_t lim;
--- a/usr/src/lib/libc/port/locale/runetype.h Fri Jul 30 21:32:33 2010 -0700 +++ b/usr/src/lib/libc/port/locale/runetype.h Sun Aug 01 17:20:38 2010 -0700 @@ -104,7 +104,7 @@ __rune_t __min; /* First rune of the range */ __rune_t __max; /* Last rune (inclusive) of the range */ __rune_t __map; /* What first maps to in maps */ - unsigned long *__types; /* Array of types in range */ + unsigned *__types; /* Array of types in range */ } _RuneEntry; typedef struct {
--- a/usr/src/lib/libc/port/locale/strfmon.c Fri Jul 30 21:32:33 2010 -0700 +++ b/usr/src/lib/libc/port/locale/strfmon.c Sun Aug 01 17:20:38 2010 -0700 @@ -377,7 +377,7 @@ PRINT(' '); } else { pad_size = dst-tmpptr; - memmove(tmpptr + width-pad_size, tmpptr, + (void) memmove(tmpptr + width-pad_size, tmpptr, pad_size); (void) memset(tmpptr, ' ', width-pad_size); dst += width-pad_size; @@ -620,7 +620,7 @@ } bufsize = bufsize - (bufend - rslt) + 1; - memmove(rslt, bufend, bufsize); + (void) memmove(rslt, bufend, bufsize); free(avalue); return (rslt); }