aboutsummaryrefslogtreecommitdiffstats
path: root/lib/string.in.h
diff options
context:
space:
mode:
authorPaul Eggert2022-04-19 19:16:29 -0700
committerPaul Eggert2022-04-19 19:19:35 -0700
commit992cf3cb675e074079341cc54c3b16d37a8b9ca8 (patch)
tree8d8acc03885fb789b3fc036e013e01a095d5164d /lib/string.in.h
parent67940394c03450e767724a461c061921e2329bab (diff)
downloademacs-992cf3cb675e074079341cc54c3b16d37a8b9ca8.tar.gz
emacs-992cf3cb675e074079341cc54c3b16d37a8b9ca8.zip
Update from gnulib
Diffstat (limited to 'lib/string.in.h')
-rw-r--r--lib/string.in.h61
1 files changed, 40 insertions, 21 deletions
diff --git a/lib/string.in.h b/lib/string.in.h
index c9432948c15..b6840fa9121 100644
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -125,14 +125,22 @@ _GL_EXTERN_C void rpl_free (void *);
125# if defined _MSC_VER 125# if defined _MSC_VER
126_GL_EXTERN_C void __cdecl free (void *); 126_GL_EXTERN_C void __cdecl free (void *);
127# else 127# else
128# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
129_GL_EXTERN_C void free (void *) throw ();
130# else
128_GL_EXTERN_C void free (void *); 131_GL_EXTERN_C void free (void *);
132# endif
129# endif 133# endif
130# endif 134# endif
131#else 135#else
132# if defined _MSC_VER 136# if defined _MSC_VER
133_GL_EXTERN_C void __cdecl free (void *); 137_GL_EXTERN_C void __cdecl free (void *);
134# else 138# else
139# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
140_GL_EXTERN_C void free (void *) throw ();
141# else
135_GL_EXTERN_C void free (void *); 142_GL_EXTERN_C void free (void *);
143# endif
136# endif 144# endif
137#endif 145#endif
138 146
@@ -230,10 +238,11 @@ _GL_CXXALIAS_SYS_CAST2 (memchr,
230 void const *, (void const *__s, int __c, size_t __n)); 238 void const *, (void const *__s, int __c, size_t __n));
231# endif 239# endif
232# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ 240# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
233 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) 241 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
234_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n)); 242 || defined __clang__)
243_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n) throw ());
235_GL_CXXALIASWARN1 (memchr, void const *, 244_GL_CXXALIASWARN1 (memchr, void const *,
236 (void const *__s, int __c, size_t __n)); 245 (void const *__s, int __c, size_t __n) throw ());
237# elif __GLIBC__ >= 2 246# elif __GLIBC__ >= 2
238_GL_CXXALIASWARN (memchr); 247_GL_CXXALIASWARN (memchr);
239# endif 248# endif
@@ -315,9 +324,10 @@ _GL_CXXALIAS_SYS_CAST2 (memrchr,
315 void *, (void const *, int, size_t), 324 void *, (void const *, int, size_t),
316 void const *, (void const *, int, size_t)); 325 void const *, (void const *, int, size_t));
317# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ 326# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
318 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) 327 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
319_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t)); 328 || defined __clang__)
320_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t)); 329_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t) throw ());
330_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t) throw ());
321# else 331# else
322_GL_CXXALIASWARN (memrchr); 332_GL_CXXALIASWARN (memrchr);
323# endif 333# endif
@@ -345,9 +355,11 @@ _GL_CXXALIAS_SYS_CAST2 (rawmemchr,
345 void *, (void const *__s, int __c_in), 355 void *, (void const *__s, int __c_in),
346 void const *, (void const *__s, int __c_in)); 356 void const *, (void const *__s, int __c_in));
347# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ 357# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
348 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) 358 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
349_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in)); 359 || defined __clang__)
350_GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in)); 360_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in) throw ());
361_GL_CXXALIASWARN1 (rawmemchr, void const *,
362 (void const *__s, int __c_in) throw ());
351# else 363# else
352_GL_CXXALIASWARN (rawmemchr); 364_GL_CXXALIASWARN (rawmemchr);
353# endif 365# endif
@@ -449,9 +461,11 @@ _GL_CXXALIAS_SYS_CAST2 (strchrnul,
449 char const *, (char const *__s, int __c_in)); 461 char const *, (char const *__s, int __c_in));
450# endif 462# endif
451# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ 463# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
452 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) 464 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
453_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in)); 465 || defined __clang__)
454_GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in)); 466_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in) throw ());
467_GL_CXXALIASWARN1 (strchrnul, char const *,
468 (char const *__s, int __c_in) throw ());
455# else 469# else
456_GL_CXXALIASWARN (strchrnul); 470_GL_CXXALIASWARN (strchrnul);
457# endif 471# endif
@@ -651,10 +665,11 @@ _GL_CXXALIAS_SYS_CAST2 (strpbrk,
651 char *, (char const *__s, char const *__accept), 665 char *, (char const *__s, char const *__accept),
652 const char *, (char const *__s, char const *__accept)); 666 const char *, (char const *__s, char const *__accept));
653# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ 667# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
654 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) 668 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
655_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept)); 669 || defined __clang__)
670_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept) throw ());
656_GL_CXXALIASWARN1 (strpbrk, char const *, 671_GL_CXXALIASWARN1 (strpbrk, char const *,
657 (char const *__s, char const *__accept)); 672 (char const *__s, char const *__accept) throw ());
658# elif __GLIBC__ >= 2 673# elif __GLIBC__ >= 2
659_GL_CXXALIASWARN (strpbrk); 674_GL_CXXALIASWARN (strpbrk);
660# endif 675# endif
@@ -759,10 +774,12 @@ _GL_CXXALIAS_SYS_CAST2 (strstr,
759 const char *, (const char *haystack, const char *needle)); 774 const char *, (const char *haystack, const char *needle));
760# endif 775# endif
761# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ 776# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
762 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) 777 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
763_GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle)); 778 || defined __clang__)
779_GL_CXXALIASWARN1 (strstr, char *,
780 (char *haystack, const char *needle) throw ());
764_GL_CXXALIASWARN1 (strstr, const char *, 781_GL_CXXALIASWARN1 (strstr, const char *,
765 (const char *haystack, const char *needle)); 782 (const char *haystack, const char *needle) throw ());
766# elif __GLIBC__ >= 2 783# elif __GLIBC__ >= 2
767_GL_CXXALIASWARN (strstr); 784_GL_CXXALIASWARN (strstr);
768# endif 785# endif
@@ -808,10 +825,12 @@ _GL_CXXALIAS_SYS_CAST2 (strcasestr,
808 const char *, (const char *haystack, const char *needle)); 825 const char *, (const char *haystack, const char *needle));
809# endif 826# endif
810# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ 827# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
811 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) 828 && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
812_GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle)); 829 || defined __clang__)
830_GL_CXXALIASWARN1 (strcasestr, char *,
831 (char *haystack, const char *needle) throw ());
813_GL_CXXALIASWARN1 (strcasestr, const char *, 832_GL_CXXALIASWARN1 (strcasestr, const char *,
814 (const char *haystack, const char *needle)); 833 (const char *haystack, const char *needle) throw ());
815# else 834# else
816_GL_CXXALIASWARN (strcasestr); 835_GL_CXXALIASWARN (strcasestr);
817# endif 836# endif
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-12 06:35:16 +0000