aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/s390/bits
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-11-23 15:21:46 +0000
committerUlrich Drepper <drepper@redhat.com>2007-11-23 15:21:46 +0000
commit37143323d822ef3fb2711a7b4b4ad2475110af64 (patch)
tree3cdd4c7c5122c2cc86bb485485342326c91c4b55 /sysdeps/s390/bits
parentdcdcf4b9c92d4c0cdcef0979ea35472f481d84c9 (diff)
downloadglibc-37143323d822ef3fb2711a7b4b4ad2475110af64.tar
glibc-37143323d822ef3fb2711a7b4b4ad2475110af64.tar.gz
glibc-37143323d822ef3fb2711a7b4b4ad2475110af64.tar.bz2
glibc-37143323d822ef3fb2711a7b4b4ad2475110af64.zip
* sysdeps/s390/bits/string.h (strlen, strcpy, strncpy, strcat,
strncat): Define as macros to avoid compile errors.
Diffstat (limited to 'sysdeps/s390/bits')
-rw-r--r--sysdeps/s390/bits/string.h20
1 files changed, 15 insertions, 5 deletions
diff --git a/sysdeps/s390/bits/string.h b/sysdeps/s390/bits/string.h
index 87550c5f67..b2a3ba9c98 100644
--- a/sysdeps/s390/bits/string.h
+++ b/sysdeps/s390/bits/string.h
@@ -40,8 +40,10 @@
#define _HAVE_STRING_ARCH_strlen 1
#ifndef _FORCE_INLINES
+#define strlen(str) __strlen_g ((str))
+
__STRING_INLINE size_t
-strlen (__const char *__str)
+__strlen_g (__const char *__str)
{
char *__ptr, *__tmp;
@@ -59,8 +61,10 @@ strlen (__const char *__str)
/* Copy SRC to DEST. */
#define _HAVE_STRING_ARCH_strcpy 1
#ifndef _FORCE_INLINES
+#define strcpy(dest, src) __strcpy_g ((dest), (src))
+
__STRING_INLINE char *
-strcpy (char *__dest, __const char *__src)
+__strcpy_g (char *__dest, __const char *__src)
{
char *tmp = __dest;
@@ -75,8 +79,10 @@ strcpy (char *__dest, __const char *__src)
#define _HAVE_STRING_ARCH_strncpy 1
#ifndef _FORCE_INLINES
+#define strncpy(dest, src, n) __strncpy_g ((dest), (src), (n))
+
__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 *__ptr;
@@ -114,8 +120,10 @@ strncpy (char *__dest, __const char *__src, size_t __n)
/* Append SRC onto DEST. */
#define _HAVE_STRING_ARCH_strcat 1
#ifndef _FORCE_INLINES
+#define strcat(dest, src) __strcat_g ((dest), (src))
+
__STRING_INLINE char *
-strcat(char *__dest, const char *__src)
+__strcat_g(char *__dest, const char *__src)
{
char *__ret = __dest;
char *__ptr, *__tmp;
@@ -142,8 +150,10 @@ strcat(char *__dest, const char *__src)
/* Append no more than N characters from SRC onto DEST. */
#define _HAVE_STRING_ARCH_strncat 1
#ifndef _FORCE_INLINES
+#define strncat(dest, src, n) __strncat_g ((dest), (src), (n))
+
__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 *__ptr, *__tmp;