diff options
author | guenther <> | 2015-09-12 16:23:14 +0000 |
---|---|---|
committer | guenther <> | 2015-09-12 16:23:14 +0000 |
commit | 913cc548a379f5f2408e621a6c02c786392dab9d (patch) | |
tree | 5148a0ffe69b5fa2b2c4caf343db71769142afed | |
parent | 56a3e20d1e41c02e4afd069925ec512ebb40b905 (diff) | |
download | openbsd-913cc548a379f5f2408e621a6c02c786392dab9d.tar.gz openbsd-913cc548a379f5f2408e621a6c02c786392dab9d.tar.bz2 openbsd-913cc548a379f5f2408e621a6c02c786392dab9d.zip |
Wrap <inttypes.h> and finish wrapping of <wchar.h> so that calls go direct
and the symbols not in the C standard are weak
-rw-r--r-- | src/lib/libc/stdlib/strtoimax.c | 3 | ||||
-rw-r--r-- | src/lib/libc/stdlib/strtoumax.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcscasecmp.c | 4 | ||||
-rw-r--r-- | src/lib/libc/string/wcscat.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcschr.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcscmp.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcscspn.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcsdup.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcslcat.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcslcpy.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcslen.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcsncat.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcsncmp.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcsncpy.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcspbrk.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcsrchr.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcsspn.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wcsstr.c | 5 | ||||
-rw-r--r-- | src/lib/libc/string/wcswidth.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wmemchr.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wmemcmp.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wmemcpy.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wmemmove.c | 3 | ||||
-rw-r--r-- | src/lib/libc/string/wmemset.c | 3 |
24 files changed, 51 insertions, 24 deletions
diff --git a/src/lib/libc/stdlib/strtoimax.c b/src/lib/libc/stdlib/strtoimax.c index 2fc04e4850..52403a7213 100644 --- a/src/lib/libc/stdlib/strtoimax.c +++ b/src/lib/libc/stdlib/strtoimax.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: strtoimax.c,v 1.2 2014/09/13 20:10:12 schwarze Exp $ */ | 1 | /* $OpenBSD: strtoimax.c,v 1.3 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1992 The Regents of the University of California. | 3 | * Copyright (c) 1992 The Regents of the University of California. |
4 | * All rights reserved. | 4 | * All rights reserved. |
@@ -148,3 +148,4 @@ strtoimax(const char *nptr, char **endptr, int base) | |||
148 | *endptr = (char *) (any ? s - 1 : nptr); | 148 | *endptr = (char *) (any ? s - 1 : nptr); |
149 | return (acc); | 149 | return (acc); |
150 | } | 150 | } |
151 | DEF_STRONG(strtoimax); | ||
diff --git a/src/lib/libc/stdlib/strtoumax.c b/src/lib/libc/stdlib/strtoumax.c index c73f7e507c..4c5e3349f1 100644 --- a/src/lib/libc/stdlib/strtoumax.c +++ b/src/lib/libc/stdlib/strtoumax.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: strtoumax.c,v 1.2 2014/09/13 20:10:12 schwarze Exp $ */ | 1 | /* $OpenBSD: strtoumax.c,v 1.3 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1992 The Regents of the University of California. | 3 | * Copyright (c) 1992 The Regents of the University of California. |
4 | * All rights reserved. | 4 | * All rights reserved. |
@@ -106,3 +106,4 @@ strtoumax(const char *nptr, char **endptr, int base) | |||
106 | *endptr = (char *) (any ? s - 1 : nptr); | 106 | *endptr = (char *) (any ? s - 1 : nptr); |
107 | return (acc); | 107 | return (acc); |
108 | } | 108 | } |
109 | DEF_STRONG(strtoumax); | ||
diff --git a/src/lib/libc/string/wcscasecmp.c b/src/lib/libc/string/wcscasecmp.c index b14997ee75..b122e720fe 100644 --- a/src/lib/libc/string/wcscasecmp.c +++ b/src/lib/libc/string/wcscasecmp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcscasecmp.c,v 1.2 2011/06/01 19:29:48 naddy Exp $ */ | 1 | /* $OpenBSD: wcscasecmp.c,v 1.3 2015/09/12 16:23:14 guenther Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2011 Marc Espie | 4 | * Copyright (c) 2011 Marc Espie |
@@ -41,6 +41,7 @@ wcscasecmp(const wchar_t *s1, const wchar_t *s2) | |||
41 | /* XXX assumes wchar_t = int */ | 41 | /* XXX assumes wchar_t = int */ |
42 | return ((rune_t)l1 - (rune_t)l2); | 42 | return ((rune_t)l1 - (rune_t)l2); |
43 | } | 43 | } |
44 | DEF_WEAK(wcscasecmp); | ||
44 | 45 | ||
45 | int | 46 | int |
46 | wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n) | 47 | wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n) |
@@ -59,3 +60,4 @@ wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n) | |||
59 | } while (--n != 0); | 60 | } while (--n != 0); |
60 | return (0); | 61 | return (0); |
61 | } | 62 | } |
63 | DEF_WEAK(wcsncasecmp); | ||
diff --git a/src/lib/libc/string/wcscat.c b/src/lib/libc/string/wcscat.c index a4841a975a..5ddb510fad 100644 --- a/src/lib/libc/string/wcscat.c +++ b/src/lib/libc/string/wcscat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcscat.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wcscat.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcscat.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ | 2 | /* $NetBSD: wcscat.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -53,3 +53,4 @@ wcscat(wchar_t *s1, const wchar_t *s2) | |||
53 | *q = '\0'; | 53 | *q = '\0'; |
54 | return s1; | 54 | return s1; |
55 | } | 55 | } |
56 | DEF_STRONG(wcscat); | ||
diff --git a/src/lib/libc/string/wcschr.c b/src/lib/libc/string/wcschr.c index b84a2d32e3..231c7605a2 100644 --- a/src/lib/libc/string/wcschr.c +++ b/src/lib/libc/string/wcschr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcschr.c,v 1.4 2008/08/23 05:34:36 djm Exp $ */ | 1 | /* $OpenBSD: wcschr.c,v 1.5 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcschr.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ | 2 | /* $NetBSD: wcschr.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -48,3 +48,4 @@ wcschr(const wchar_t *s, wchar_t c) | |||
48 | } | 48 | } |
49 | /* NOTREACHED */ | 49 | /* NOTREACHED */ |
50 | } | 50 | } |
51 | DEF_STRONG(wcschr); | ||
diff --git a/src/lib/libc/string/wcscmp.c b/src/lib/libc/string/wcscmp.c index 4a8f6ba3fb..42d6bca3cc 100644 --- a/src/lib/libc/string/wcscmp.c +++ b/src/lib/libc/string/wcscmp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcscmp.c,v 1.4 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wcscmp.c,v 1.5 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcscmp.c,v 1.5 2003/08/07 16:43:54 agc Exp $ */ | 2 | /* $NetBSD: wcscmp.c,v 1.5 2003/08/07 16:43:54 agc Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -49,3 +49,4 @@ wcscmp(const wchar_t *s1, const wchar_t *s2) | |||
49 | /* XXX assumes wchar_t = int */ | 49 | /* XXX assumes wchar_t = int */ |
50 | return (*(const rune_t *)s1 - *(const rune_t *)--s2); | 50 | return (*(const rune_t *)s1 - *(const rune_t *)--s2); |
51 | } | 51 | } |
52 | DEF_STRONG(wcscmp); | ||
diff --git a/src/lib/libc/string/wcscspn.c b/src/lib/libc/string/wcscspn.c index cf40092465..23e78ab22f 100644 --- a/src/lib/libc/string/wcscspn.c +++ b/src/lib/libc/string/wcscspn.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcscspn.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wcscspn.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcscspn.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ | 2 | /* $NetBSD: wcscspn.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -51,3 +51,4 @@ wcscspn(const wchar_t *s, const wchar_t *set) | |||
51 | done: | 51 | done: |
52 | return (p - s); | 52 | return (p - s); |
53 | } | 53 | } |
54 | DEF_STRONG(wcscspn); | ||
diff --git a/src/lib/libc/string/wcsdup.c b/src/lib/libc/string/wcsdup.c index 085d1c445d..36f19186ab 100644 --- a/src/lib/libc/string/wcsdup.c +++ b/src/lib/libc/string/wcsdup.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcsdup.c,v 1.2 2014/10/08 05:27:17 deraadt Exp $ */ | 1 | /* $OpenBSD: wcsdup.c,v 1.3 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcsdup.c,v 1.3 2008/05/26 13:17:48 haad Exp $ */ | 2 | /* $NetBSD: wcsdup.c,v 1.3 2008/05/26 13:17:48 haad Exp $ */ |
3 | 3 | ||
4 | /* | 4 | /* |
@@ -29,3 +29,4 @@ wcsdup(const wchar_t *str) | |||
29 | 29 | ||
30 | return (wmemcpy(copy, str, len)); | 30 | return (wmemcpy(copy, str, len)); |
31 | } | 31 | } |
32 | DEF_WEAK(wcsdup); | ||
diff --git a/src/lib/libc/string/wcslcat.c b/src/lib/libc/string/wcslcat.c index 2dfe2aae31..aa58146625 100644 --- a/src/lib/libc/string/wcslcat.c +++ b/src/lib/libc/string/wcslcat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcslcat.c,v 1.5 2015/01/15 03:54:12 millert Exp $ */ | 1 | /* $OpenBSD: wcslcat.c,v 1.6 2015/09/12 16:23:14 guenther Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com> | 4 | * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com> |
@@ -53,3 +53,4 @@ wcslcat(wchar_t *dst, const wchar_t *src, size_t dsize) | |||
53 | 53 | ||
54 | return(dlen + (src - osrc)); /* count does not include NUL */ | 54 | return(dlen + (src - osrc)); /* count does not include NUL */ |
55 | } | 55 | } |
56 | DEF_WEAK(wcslcat); | ||
diff --git a/src/lib/libc/string/wcslcpy.c b/src/lib/libc/string/wcslcpy.c index 1c4811577f..36a544a33c 100644 --- a/src/lib/libc/string/wcslcpy.c +++ b/src/lib/libc/string/wcslcpy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcslcpy.c,v 1.6 2015/01/15 03:54:12 millert Exp $ */ | 1 | /* $OpenBSD: wcslcpy.c,v 1.7 2015/09/12 16:23:14 guenther Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com> | 4 | * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com> |
@@ -48,3 +48,4 @@ wcslcpy(wchar_t *dst, const wchar_t *src, size_t dsize) | |||
48 | 48 | ||
49 | return(src - osrc - 1); /* count does not include NUL */ | 49 | return(src - osrc - 1); /* count does not include NUL */ |
50 | } | 50 | } |
51 | DEF_WEAK(wcslcpy); | ||
diff --git a/src/lib/libc/string/wcslen.c b/src/lib/libc/string/wcslen.c index c1de4a271e..16d4bba128 100644 --- a/src/lib/libc/string/wcslen.c +++ b/src/lib/libc/string/wcslen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcslen.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wcslen.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcslen.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ | 2 | /* $NetBSD: wcslen.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -42,3 +42,4 @@ wcslen(const wchar_t *s) | |||
42 | 42 | ||
43 | return p - s; | 43 | return p - s; |
44 | } | 44 | } |
45 | DEF_STRONG(wcslen); | ||
diff --git a/src/lib/libc/string/wcsncat.c b/src/lib/libc/string/wcsncat.c index eb9a701514..2b4b9f0d49 100644 --- a/src/lib/libc/string/wcsncat.c +++ b/src/lib/libc/string/wcsncat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcsncat.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wcsncat.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcsncat.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ | 2 | /* $NetBSD: wcsncat.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -50,3 +50,4 @@ wcsncat(wchar_t *s1, const wchar_t *s2, size_t n) | |||
50 | *q = '\0'; | 50 | *q = '\0'; |
51 | return s1; | 51 | return s1; |
52 | } | 52 | } |
53 | DEF_STRONG(wcsncat); | ||
diff --git a/src/lib/libc/string/wcsncmp.c b/src/lib/libc/string/wcsncmp.c index fb3c7057cf..bdaab33e4c 100644 --- a/src/lib/libc/string/wcsncmp.c +++ b/src/lib/libc/string/wcsncmp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcsncmp.c,v 1.4 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wcsncmp.c,v 1.5 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcsncmp.c,v 1.5 2003/08/07 16:43:54 agc Exp $ */ | 2 | /* $NetBSD: wcsncmp.c,v 1.5 2003/08/07 16:43:54 agc Exp $ */ |
3 | 3 | ||
4 | /* | 4 | /* |
@@ -50,3 +50,4 @@ wcsncmp(const wchar_t *s1, const wchar_t *s2, size_t n) | |||
50 | } while (--n != 0); | 50 | } while (--n != 0); |
51 | return (0); | 51 | return (0); |
52 | } | 52 | } |
53 | DEF_STRONG(wcsncmp); | ||
diff --git a/src/lib/libc/string/wcsncpy.c b/src/lib/libc/string/wcsncpy.c index 107696f1de..1be482b114 100644 --- a/src/lib/libc/string/wcsncpy.c +++ b/src/lib/libc/string/wcsncpy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcsncpy.c,v 1.4 2006/04/17 18:05:35 espie Exp $ */ | 1 | /* $OpenBSD: wcsncpy.c,v 1.5 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcsncpy.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ | 2 | /* $NetBSD: wcsncpy.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -48,3 +48,4 @@ wcsncpy(wchar_t *s1, const wchar_t *s2, size_t n) | |||
48 | 48 | ||
49 | return s1; | 49 | return s1; |
50 | } | 50 | } |
51 | DEF_STRONG(wcsncpy); | ||
diff --git a/src/lib/libc/string/wcspbrk.c b/src/lib/libc/string/wcspbrk.c index 1923abfc89..2178dc4067 100644 --- a/src/lib/libc/string/wcspbrk.c +++ b/src/lib/libc/string/wcspbrk.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcspbrk.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wcspbrk.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcspbrk.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ | 2 | /* $NetBSD: wcspbrk.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -51,3 +51,4 @@ wcspbrk(const wchar_t *s, const wchar_t *set) | |||
51 | } | 51 | } |
52 | return NULL; | 52 | return NULL; |
53 | } | 53 | } |
54 | DEF_STRONG(wcspbrk); | ||
diff --git a/src/lib/libc/string/wcsrchr.c b/src/lib/libc/string/wcsrchr.c index 3433310c56..b69bdac1c9 100644 --- a/src/lib/libc/string/wcsrchr.c +++ b/src/lib/libc/string/wcsrchr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcsrchr.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wcsrchr.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcsrchr.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ | 2 | /* $NetBSD: wcsrchr.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -48,3 +48,4 @@ wcsrchr(const wchar_t *s, wchar_t c) | |||
48 | } | 48 | } |
49 | return NULL; | 49 | return NULL; |
50 | } | 50 | } |
51 | DEF_STRONG(wcsrchr); | ||
diff --git a/src/lib/libc/string/wcsspn.c b/src/lib/libc/string/wcsspn.c index 5162fa0763..a3f28e3a49 100644 --- a/src/lib/libc/string/wcsspn.c +++ b/src/lib/libc/string/wcsspn.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcsspn.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wcsspn.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcsspn.c,v 1.3 2001/09/21 16:09:15 yamt Exp $ */ | 2 | /* $NetBSD: wcsspn.c,v 1.3 2001/09/21 16:09:15 yamt Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -53,3 +53,4 @@ wcsspn(const wchar_t *s, const wchar_t *set) | |||
53 | done: | 53 | done: |
54 | return (p - s); | 54 | return (p - s); |
55 | } | 55 | } |
56 | DEF_STRONG(wcsspn); | ||
diff --git a/src/lib/libc/string/wcsstr.c b/src/lib/libc/string/wcsstr.c index 669e340280..6a08b62551 100644 --- a/src/lib/libc/string/wcsstr.c +++ b/src/lib/libc/string/wcsstr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcsstr.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wcsstr.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcsstr.c,v 1.3 2003/03/05 20:18:17 tshiozak Exp $ */ | 2 | /* $NetBSD: wcsstr.c,v 1.3 2003/03/05 20:18:17 tshiozak Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -68,3 +68,6 @@ wcsstr(const wchar_t *big, const wchar_t *little) | |||
68 | } | 68 | } |
69 | return NULL; | 69 | return NULL; |
70 | } | 70 | } |
71 | #ifndef WCSWCS | ||
72 | DEF_STRONG(wcsstr); | ||
73 | #endif | ||
diff --git a/src/lib/libc/string/wcswidth.c b/src/lib/libc/string/wcswidth.c index 8ea1bdf6e6..9f003f96c7 100644 --- a/src/lib/libc/string/wcswidth.c +++ b/src/lib/libc/string/wcswidth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wcswidth.c,v 1.4 2011/04/04 18:16:24 stsp Exp $ */ | 1 | /* $OpenBSD: wcswidth.c,v 1.5 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wcswidth.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ | 2 | /* $NetBSD: wcswidth.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -48,3 +48,4 @@ wcswidth(const wchar_t *s, size_t n) | |||
48 | 48 | ||
49 | return w; | 49 | return w; |
50 | } | 50 | } |
51 | DEF_WEAK(wcswidth); | ||
diff --git a/src/lib/libc/string/wmemchr.c b/src/lib/libc/string/wmemchr.c index 8c9517861b..55fb76a5e6 100644 --- a/src/lib/libc/string/wmemchr.c +++ b/src/lib/libc/string/wmemchr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wmemchr.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wmemchr.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wmemchr.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ | 2 | /* $NetBSD: wmemchr.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -45,3 +45,4 @@ wmemchr(const wchar_t *s, wchar_t c, size_t n) | |||
45 | } | 45 | } |
46 | return NULL; | 46 | return NULL; |
47 | } | 47 | } |
48 | DEF_STRONG(wmemchr); | ||
diff --git a/src/lib/libc/string/wmemcmp.c b/src/lib/libc/string/wmemcmp.c index 39419aeddc..46617e29cf 100644 --- a/src/lib/libc/string/wmemcmp.c +++ b/src/lib/libc/string/wmemcmp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wmemcmp.c,v 1.4 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wmemcmp.c,v 1.5 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wmemcmp.c,v 1.3 2003/04/06 18:33:23 tshiozak Exp $ */ | 2 | /* $NetBSD: wmemcmp.c,v 1.3 2003/04/06 18:33:23 tshiozak Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -48,3 +48,4 @@ wmemcmp(const wchar_t *s1, const wchar_t *s2, size_t n) | |||
48 | } | 48 | } |
49 | return 0; | 49 | return 0; |
50 | } | 50 | } |
51 | DEF_STRONG(wmemcmp); | ||
diff --git a/src/lib/libc/string/wmemcpy.c b/src/lib/libc/string/wmemcpy.c index 9bbd83648e..cf02ab9d56 100644 --- a/src/lib/libc/string/wmemcpy.c +++ b/src/lib/libc/string/wmemcpy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wmemcpy.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wmemcpy.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wmemcpy.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ | 2 | /* $NetBSD: wmemcpy.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -38,3 +38,4 @@ wmemcpy(wchar_t *d, const wchar_t *s, size_t n) | |||
38 | 38 | ||
39 | return (wchar_t *)memcpy(d, s, n * sizeof(wchar_t)); | 39 | return (wchar_t *)memcpy(d, s, n * sizeof(wchar_t)); |
40 | } | 40 | } |
41 | DEF_STRONG(wmemcpy); | ||
diff --git a/src/lib/libc/string/wmemmove.c b/src/lib/libc/string/wmemmove.c index 21bbabcd0c..8bf8011064 100644 --- a/src/lib/libc/string/wmemmove.c +++ b/src/lib/libc/string/wmemmove.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wmemmove.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wmemmove.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wmemmove.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ | 2 | /* $NetBSD: wmemmove.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -38,3 +38,4 @@ wmemmove(wchar_t *d, const wchar_t *s, size_t n) | |||
38 | 38 | ||
39 | return (wchar_t *)memmove(d, s, n * sizeof(wchar_t)); | 39 | return (wchar_t *)memmove(d, s, n * sizeof(wchar_t)); |
40 | } | 40 | } |
41 | DEF_STRONG(wmemmove); | ||
diff --git a/src/lib/libc/string/wmemset.c b/src/lib/libc/string/wmemset.c index ac476dba6a..a2d3295170 100644 --- a/src/lib/libc/string/wmemset.c +++ b/src/lib/libc/string/wmemset.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wmemset.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: wmemset.c,v 1.4 2015/09/12 16:23:14 guenther Exp $ */ |
2 | /* $NetBSD: wmemset.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ | 2 | /* $NetBSD: wmemset.c,v 1.2 2001/01/03 14:29:37 lukem Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -44,3 +44,4 @@ wmemset(wchar_t *s, wchar_t c, size_t n) | |||
44 | } | 44 | } |
45 | return s; | 45 | return s; |
46 | } | 46 | } |
47 | DEF_STRONG(wmemset); | ||