* sysdeps/s390/bits/string.h (strlen, strcpy, strncpy, strcat,

strncat): Define as macros to avoid compile errors.
This commit is contained in:
Ulrich Drepper 2007-11-23 15:21:46 +00:00
parent dcdcf4b9c9
commit 37143323d8
2 changed files with 18 additions and 5 deletions

View File

@ -11,6 +11,9 @@
2007-11-22 Martin Schwidefsky <schwidefsky@de.ibm.com> 2007-11-22 Martin Schwidefsky <schwidefsky@de.ibm.com>
* sysdeps/s390/bits/string.h (strlen, strcpy, strncpy, strcat,
strncat): Define as macros to avoid compile errors.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Add open and * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Add open and
creat entries. creat entries.

View File

@ -40,8 +40,10 @@
#define _HAVE_STRING_ARCH_strlen 1 #define _HAVE_STRING_ARCH_strlen 1
#ifndef _FORCE_INLINES #ifndef _FORCE_INLINES
#define strlen(str) __strlen_g ((str))
__STRING_INLINE size_t __STRING_INLINE size_t
strlen (__const char *__str) __strlen_g (__const char *__str)
{ {
char *__ptr, *__tmp; char *__ptr, *__tmp;
@ -59,8 +61,10 @@ strlen (__const char *__str)
/* Copy SRC to DEST. */ /* Copy SRC to DEST. */
#define _HAVE_STRING_ARCH_strcpy 1 #define _HAVE_STRING_ARCH_strcpy 1
#ifndef _FORCE_INLINES #ifndef _FORCE_INLINES
#define strcpy(dest, src) __strcpy_g ((dest), (src))
__STRING_INLINE char * __STRING_INLINE char *
strcpy (char *__dest, __const char *__src) __strcpy_g (char *__dest, __const char *__src)
{ {
char *tmp = __dest; char *tmp = __dest;
@ -75,8 +79,10 @@ strcpy (char *__dest, __const char *__src)
#define _HAVE_STRING_ARCH_strncpy 1 #define _HAVE_STRING_ARCH_strncpy 1
#ifndef _FORCE_INLINES #ifndef _FORCE_INLINES
#define strncpy(dest, src, n) __strncpy_g ((dest), (src), (n))
__STRING_INLINE char * __STRING_INLINE char *
strncpy (char *__dest, __const char *__src, size_t __n) __strncpy_g (char *__dest, __const char *__src, size_t __n)
{ {
char *__ret = __dest; char *__ret = __dest;
char *__ptr; char *__ptr;
@ -114,8 +120,10 @@ strncpy (char *__dest, __const char *__src, size_t __n)
/* Append SRC onto DEST. */ /* Append SRC onto DEST. */
#define _HAVE_STRING_ARCH_strcat 1 #define _HAVE_STRING_ARCH_strcat 1
#ifndef _FORCE_INLINES #ifndef _FORCE_INLINES
#define strcat(dest, src) __strcat_g ((dest), (src))
__STRING_INLINE char * __STRING_INLINE char *
strcat(char *__dest, const char *__src) __strcat_g(char *__dest, const char *__src)
{ {
char *__ret = __dest; char *__ret = __dest;
char *__ptr, *__tmp; char *__ptr, *__tmp;
@ -142,8 +150,10 @@ strcat(char *__dest, const char *__src)
/* Append no more than N characters from SRC onto DEST. */ /* Append no more than N characters from SRC onto DEST. */
#define _HAVE_STRING_ARCH_strncat 1 #define _HAVE_STRING_ARCH_strncat 1
#ifndef _FORCE_INLINES #ifndef _FORCE_INLINES
#define strncat(dest, src, n) __strncat_g ((dest), (src), (n))
__STRING_INLINE char * __STRING_INLINE char *
strncat (char *__dest, __const char *__src, size_t __n) __strncat_g (char *__dest, __const char *__src, size_t __n)
{ {
char *__ret = __dest; char *__ret = __dest;
char *__ptr, *__tmp; char *__ptr, *__tmp;