From e9c949781598a0476a6cdb953e5f09442d5ca016 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 9 Mar 2000 22:25:01 +0000 Subject: [PATCH] Thu Mar 9 17:20:41 2000 Jeff Johnston * libc/include/string.h: Changed last argument back to ssize_t to make it compatible with XPG4 definition which is defined in . There is a conflict in the SVID 3 and XPG4 definitions and newlib will settle with XPG4. * libc/string/swab.c: Ditto. --- newlib/ChangeLog | 8 ++++++++ newlib/libc/include/string.h | 2 +- newlib/libc/string/swab.c | 8 ++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index d843246f2..cda46e7ac 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,11 @@ +Thu Mar 9 17:20:41 2000 Jeff Johnston + + * libc/include/string.h: Changed last argument back to ssize_t + to make it compatible with XPG4 definition which is + defined in . There is a conflict in the SVID 3 + and XPG4 definitions and newlib will settle with XPG4. + * libc/string/swab.c: Ditto. + Wed Mar 8 17:11:41 2000 Jeff Johnston * libc/include/string.h: Changed last argument to size_t. diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h index 7ec2dcf34..0707aac16 100644 --- a/newlib/libc/include/string.h +++ b/newlib/libc/include/string.h @@ -69,7 +69,7 @@ char *_EXFUN(strupr,(char *)); char *_EXFUN(strsignal, (int __signo)); int _EXFUN(strtosigno, (const char *__name)); #endif -void _EXFUN(swab,(const void *, void *, size_t)); +void _EXFUN(swab,(const void *, void *, ssize_t)); /* These function names are used on Windows and perhaps other systems. */ #ifndef strcmpi diff --git a/newlib/libc/string/swab.c b/newlib/libc/string/swab.c index 49d61e134..98daf5a1a 100644 --- a/newlib/libc/string/swab.c +++ b/newlib/libc/string/swab.c @@ -4,13 +4,13 @@ FUNCTION ANSI_SYNOPSIS #include - void swab(const void *<[in]>, void *<[out]>, size_t <[n]>); + void swab(const void *<[in]>, void *<[out]>, ssize_t <[n]>); TRAD_SYNOPSIS void swab(<[in]>, <[out]>, <[n]> void *<[in]>; void *<[out]>; - size_t <[n]>; + ssize_t <[n]>; DESCRIPTION This function copies <[n]> bytes from the memory region @@ -27,11 +27,11 @@ void _DEFUN (swab, (b1, b2, length), _CONST void *b1 _AND void *b2 _AND - size_t length) + ssize_t length) { const char *from = b1; char *to = b2; - size_t ptr; + ssize_t ptr; for (ptr = 1; ptr < length; ptr += 2) { char p = from[ptr];