tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1Based on https://gitweb.git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff_plain;h=c44fe03b72687c9e913727724c29bdb49c1f86e3
2
3--- a/lib/string.in.h
4+++ b/lib/string.in.h
5@@ -214,63 +214,83 @@
6
7 /* Declarations for ISO C N3322. */
8 #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
9+# ifndef memcpy
10 _GL_EXTERN_C void *memcpy (void *__dest, const void *__src, size_t __n)
11-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
12+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
13 _GL_ATTRIBUTE_NOTHROW
14-# endif
15+# endif
16 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
17 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
18+# endif
19+# ifndef memccpy
20 _GL_EXTERN_C void *memccpy (void *__dest, const void *__src, int __c, size_t __n)
21-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
22+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
23 _GL_ATTRIBUTE_NOTHROW
24-# endif
25+# endif
26 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 4)
27 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 4);
28+# endif
29+# ifndef memmove
30 _GL_EXTERN_C void *memmove (void *__dest, const void *__src, size_t __n)
31-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
32+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
33 _GL_ATTRIBUTE_NOTHROW
34-# endif
35+# endif
36 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
37 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
38+# endif
39+# ifndef strncpy
40 _GL_EXTERN_C char *strncpy (char *__dest, const char *__src, size_t __n)
41-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
42+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
43 _GL_ATTRIBUTE_NOTHROW
44-# endif
45+# endif
46 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
47 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
48+# endif
49+# ifndef strndup
50 _GL_EXTERN_C char *strndup (const char *__s, size_t __n)
51-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
52+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
53 _GL_ATTRIBUTE_NOTHROW
54-# endif
55+# endif
56 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2);
57+# endif
58+# ifndef strncat
59 _GL_EXTERN_C char *strncat (char *__dest, const char *__src, size_t __n)
60-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
61+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
62 _GL_ATTRIBUTE_NOTHROW
63-# endif
64+# endif
65 _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
66+# endif
67+# ifndef memcmp
68 _GL_EXTERN_C int memcmp (const void *__s1, const void *__s2, size_t __n)
69-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
70+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
71 _GL_ATTRIBUTE_NOTHROW
72-# endif
73+# endif
74 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
75 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
76+# endif
77+# ifndef strncmp
78 _GL_EXTERN_C int strncmp (const char *__s1, const char *__s2, size_t __n)
79-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
80+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
81 _GL_ATTRIBUTE_NOTHROW
82-# endif
83+# endif
84 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
85 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
86-# ifndef __cplusplus
87+# endif
88+# if !defined memchr && !defined __cplusplus
89 _GL_EXTERN_C void *memchr (const void *__s, int __c, size_t __n)
90 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
91 _GL_EXTERN_C void *memrchr (const void *__s, int __c, size_t __n)
92 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
93 # endif
94+# ifndef memset
95 _GL_EXTERN_C void *memset (void *__s, int __c, size_t __n)
96-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
97+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
98 _GL_ATTRIBUTE_NOTHROW
99-# endif
100+# endif
101 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
102+# endif
103+# ifndef memset_explicit
104 _GL_EXTERN_C void *memset_explicit (void *__s, int __c, size_t __n)
105 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
106+# endif
107 #endif