diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/bb_init_func.c | 3 | ||||
| -rw-r--r-- | sysdeps/generic/crypt-entry.c | 14 | ||||
| -rw-r--r-- | sysdeps/unix/syscalls.list | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/gnu/types.h | 2 | ||||
| -rw-r--r-- | sysdeps/wordsize-32/inttypes.h | 19 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/inttypes.h | 35 |
6 files changed, 37 insertions, 38 deletions
diff --git a/sysdeps/generic/bb_init_func.c b/sysdeps/generic/bb_init_func.c index 15919fd03d..0560493a37 100644 --- a/sysdeps/generic/bb_init_func.c +++ b/sysdeps/generic/bb_init_func.c @@ -29,8 +29,7 @@ #include <stdlib.h> void -__bb_init_func (bb) - struct __bb *bb; +__bb_init_func (struct __bb *bb) { struct gmonparam *p = &_gmonparam; diff --git a/sysdeps/generic/crypt-entry.c b/sysdeps/generic/crypt-entry.c index ba23d1f3d4..e6c2554019 100644 --- a/sysdeps/generic/crypt-entry.c +++ b/sysdeps/generic/crypt-entry.c @@ -30,27 +30,29 @@ static const char md5_salt_prefix[] = "$1$"; /* Prototypes for the MD5 encryption replacement functions. */ -extern char *md5_crypt_r (const char *key, const char *salt, char *buffer, - int buflen); -extern char *md5_crypt (const char *key, const char *salt); +extern char *__md5_crypt_r (const char *key, const char *salt, char *buffer, + int buflen); +extern char *__md5_crypt (const char *key, const char *salt); /* We recognize an intended call of the MD5 crypt replacement function by the first 3 characters of the salt string. If they match the MD5 magic string we want MD5 encryption replacement. */ char * -crypt_r (key, salt, data) +__crypt_r (key, salt, data) const char *key; const char *salt; struct crypt_data *data; { if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0) - return md5_crypt_r (key, salt, (char *) data, sizeof (struct crypt_data)); + return __md5_crypt_r (key, salt, (char *) data, + sizeof (struct crypt_data)); /* We don't have DES encryption. */ __set_errno (EOPNOTSUPP); return NULL; } +weak_alias (__crypt_r, crypt_r) /* The same here, only we call the non-reentrant version. */ @@ -60,7 +62,7 @@ crypt (key, salt) const char *salt; { if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0) - return md5_crypt (key, salt); + return __md5_crypt (key, salt); /* We don't have DES encryption. */ __set_errno (EOPNOTSUPP); diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list index 5ececa058c..9a39b656b3 100644 --- a/sysdeps/unix/syscalls.list +++ b/sysdeps/unix/syscalls.list @@ -9,7 +9,7 @@ chroot - chroot 1 chroot close - close 1 __libc_close __close close dup - dup 1 __dup dup dup2 - dup2 2 __dup2 dup2 -fchdir - fchdir 1 fchdir +fchdir - fchdir 1 __fchdir fchdir fcntl - fcntl 3 __libc_fcntl __fcntl fcntl fstatfs - fstatfs 2 __fstatfs fstatfs fsync - fsync 1 __libc_fsync fsync diff --git a/sysdeps/unix/sysv/linux/alpha/gnu/types.h b/sysdeps/unix/sysv/linux/alpha/gnu/types.h index b23deb8aa4..2af77f70cf 100644 --- a/sysdeps/unix/sysv/linux/alpha/gnu/types.h +++ b/sysdeps/unix/sysv/linux/alpha/gnu/types.h @@ -66,7 +66,7 @@ typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef long int __clock_t; /* One element in the file descriptor mask array. */ -typedef unsigned int __fd_mask; +typedef unsigned long int __fd_mask; /* Due to incaution, we may have gotten these from a kernel header file. */ #undef __FD_SETSIZE diff --git a/sysdeps/wordsize-32/inttypes.h b/sysdeps/wordsize-32/inttypes.h index 97bfed5a0a..f3029cc823 100644 --- a/sysdeps/wordsize-32/inttypes.h +++ b/sysdeps/wordsize-32/inttypes.h @@ -21,7 +21,9 @@ */ #ifndef _INTTYPES_H + #define _INTTYPES_H 1 +#include <features.h> /* Exact integral types. */ @@ -162,24 +164,21 @@ typedef unsigned long long int uint_fast64_t; #define UINTPTR_MAX (4294967295U) -/* Macros for creating constants. */ -#define __CONCAT__(A, B) A ## B - /* Signed. */ #define INT8_C(c) ((int8_t) c) #define INT16_C(c) ((int16_t) c) #define INT32_C(c) ((int32_t) c) -#define INT64_C(c) ((int64_t) __CONCAT__ (c,ll)) +#define INT64_C(c) ((int64_t) __CONCAT (c,ll)) /* Unsigned. */ -#define UINT8_C(c) ((uint8_t) __CONCAT__ (c,u)) -#define UINT16_C(c) ((uint16_t) __CONCAT__ (c,u)) -#define UINT32_C(c) ((uint32_t) __CONCAT__ (c,u)) -#define UINT64_C(c) ((uint64_t) __CONCAT__ (c,ull)) +#define UINT8_C(c) ((uint8_t) __CONCAT (c,u)) +#define UINT16_C(c) ((uint16_t) __CONCAT (c,u)) +#define UINT32_C(c) ((uint32_t) __CONCAT (c,u)) +#define UINT64_C(c) ((uint64_t) __CONCAT (c,ull)) /* Maximal type. */ -#define INTMAX_C(c) ((intmax_t) __CONCAT__ (c,ll)) -#define UINTMAX_C(c) ((uintmax_t) __CONCAT__ (c,ull)) +#define INTMAX_C(c) ((intmax_t) __CONCAT (c,ll)) +#define UINTMAX_C(c) ((uintmax_t) __CONCAT (c,ull)) /* Macros for printing format specifiers. */ diff --git a/sysdeps/wordsize-64/inttypes.h b/sysdeps/wordsize-64/inttypes.h index 663b7b1a8d..b94aff0749 100644 --- a/sysdeps/wordsize-64/inttypes.h +++ b/sysdeps/wordsize-64/inttypes.h @@ -21,7 +21,9 @@ */ #ifndef _INTTYPES_H + #define _INTTYPES_H 1 +#include <features.h> /* Exact integral types. */ @@ -162,24 +164,21 @@ typedef unsigned long int uint_fast64_t; #define UINTPTR_MAX (18446744073709551615uL) -/* Macros for creating constants. */ -#define __CONCAT__(A, B) A ## B - /* Signed. */ #define INT8_C(c) ((int8_t) c) #define INT16_C(c) ((int16_t) c) #define INT32_C(c) ((int32_t) c) -#define INT64_C(c) ((int64_t) __CONCAT__ (c,l)) +#define INT64_C(c) ((int64_t) __CONCAT (c,l)) /* Unsigned. */ -#define UINT8_C(c) ((uint8_t) __CONCAT__ (c,u)) -#define UINT16_C(c) ((uint16_t) __CONCAT__ (c,u)) -#define UINT32_C(c) ((uint32_t) __CONCAT__ (c,u)) -#define UINT64_C(c) ((uint64_t) __CONCAT__ (c,ul)) +#define UINT8_C(c) ((uint8_t) __CONCAT (c,u)) +#define UINT16_C(c) ((uint16_t) __CONCAT (c,u)) +#define UINT32_C(c) ((uint32_t) __CONCAT (c,u)) +#define UINT64_C(c) ((uint64_t) __CONCAT (c,ul)) /* Maximal type. */ -#define INTMAX_C(c) ((intmax_t) __CONCAT__ (c,ll)) -#define UINTMAX_C(c) ((uintmax_t) __CONCAT__ (c,ul)) +#define INTMAX_C(c) ((intmax_t) __CONCAT (c,l)) +#define UINTMAX_C(c) ((uintmax_t) __CONCAT (c,ul)) /* Macros for printing format specifiers. */ @@ -290,10 +289,10 @@ typedef unsigned long int uint_fast64_t; /* Macros for printing `intfast_t' and `uintfast_t'. */ -#define PRIdFAST "d" -#define PRIoFAST "o" -#define PRIxFAST "x" -#define PRIuFAST "u" +#define PRIdFAST "ld" +#define PRIoFAST "lo" +#define PRIxFAST "lx" +#define PRIuFAST "lu" /* Macros for printing `intptr_t' and `uintptr_t'. */ @@ -326,10 +325,10 @@ typedef unsigned long int uint_fast64_t; /* Macros for scaning `intfast_t' and `uintfast_t'. */ -#define SCNdFAST "d" -#define SCNiFAST "i" -#define SCNoFAST "o" -#define SCNxFAST "x" +#define SCNdFAST "ld" +#define SCNiFAST "li" +#define SCNoFAST "lo" +#define SCNxFAST "lx" /* Macros for scaning `intptr_t' and `uintptr_t'. */ #define SCNdPTR "ld" |