diff options
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/bits/select.h | 7 | ||||
| -rw-r--r-- | sysdeps/generic/bzero.c | 3 | ||||
| -rw-r--r-- | sysdeps/generic/stpcpy.c | 3 | ||||
| -rw-r--r-- | sysdeps/generic/sysd-stdio.c | 6 |
4 files changed, 11 insertions, 8 deletions
diff --git a/sysdeps/generic/bits/select.h b/sysdeps/generic/bits/select.h index 7803335499..8487e21bb3 100644 --- a/sysdeps/generic/bits/select.h +++ b/sysdeps/generic/bits/select.h @@ -21,15 +21,14 @@ #endif -/* This line MUST be split! Otherwise m4 will not change it. - - We don't use `memset' because this would require a prototype and +/* We don't use `memset' because this would require a prototype and the array isn't too big. */ #define __FD_ZERO(set) \ do { \ unsigned int __i; \ + __fd_mask *__arr = (set); \ for (__i = 0; __i < sizeof (__fd_set) / sizeof (__fd_mask); ++__i) \ - ((__fd_mask *) set)[__i] = '\0'; \ + __arr->fds_bits[__i] = '\0'; \ } while (0) #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) #define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) diff --git a/sysdeps/generic/bzero.c b/sysdeps/generic/bzero.c index 7fda7c3b5e..002af2f0a3 100644 --- a/sysdeps/generic/bzero.c +++ b/sysdeps/generic/bzero.c @@ -22,7 +22,7 @@ /* Set N bytes of S to 0. */ void -bzero (s, len) +__bzero (s, len) void *s; size_t len; { @@ -78,3 +78,4 @@ bzero (s, len) len -= 1; } } +weak_alias (__bzero, bzero) diff --git a/sysdeps/generic/stpcpy.c b/sysdeps/generic/stpcpy.c index 0bf84cc700..e9de98ea7a 100644 --- a/sysdeps/generic/stpcpy.c +++ b/sysdeps/generic/stpcpy.c @@ -22,6 +22,9 @@ #include <string.h> +#undef __stpcpy +#undef stpcpy + #ifndef weak_alias # define __stpcpy stpcpy #endif diff --git a/sysdeps/generic/sysd-stdio.c b/sysdeps/generic/sysd-stdio.c index 9818f84c5c..da8ed20bed 100644 --- a/sysdeps/generic/sysd-stdio.c +++ b/sysdeps/generic/sysd-stdio.c @@ -28,10 +28,10 @@ /* Read N bytes into BUF from COOKIE. */ int -__stdio_read (void *cookie, char *buf, size_t n;) +__stdio_read (void *cookie, char *buf, size_t n) { const int fd = (int) cookie; -#if defined (EINTR) && defined (EINTR_REPEAT) +#if defined EINTR && defined EINTR_REPEAT int save = errno; int nread; @@ -70,7 +70,7 @@ __stdio_write (void *cookie, const char *buf, size_t n) n -= count; } else if (count < 0 -#if defined (EINTR) && defined (EINTR_REPEAT) +#if defined EINTR && defined EINTR_REPEAT && errno != EINTR #endif ) |