diff options
Diffstat (limited to 'gl/regex_internal.h')
| -rw-r--r-- | gl/regex_internal.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gl/regex_internal.h b/gl/regex_internal.h index 6165cb17..1f297299 100644 --- a/gl/regex_internal.h +++ b/gl/regex_internal.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Extended regular expression matching and search library. | 1 | /* Extended regular expression matching and search library. |
| 2 | Copyright (C) 2002-2024 Free Software Foundation, Inc. | 2 | Copyright (C) 2002-2025 Free Software Foundation, Inc. |
| 3 | This file is part of the GNU C Library. | 3 | This file is part of the GNU C Library. |
| 4 | Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. | 4 | Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. |
| 5 | 5 | ||
| @@ -100,10 +100,12 @@ | |||
| 100 | /* This is for other GNU distributions with internationalized messages. */ | 100 | /* This is for other GNU distributions with internationalized messages. */ |
| 101 | #if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC | 101 | #if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC |
| 102 | # include <libintl.h> | 102 | # include <libintl.h> |
| 103 | # undef gettext | ||
| 103 | # ifdef _LIBC | 104 | # ifdef _LIBC |
| 104 | # undef gettext | ||
| 105 | # define gettext(msgid) \ | 105 | # define gettext(msgid) \ |
| 106 | __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES) | 106 | __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES) |
| 107 | # else | ||
| 108 | # define gettext(msgid) dgettext ("gnulib", msgid) | ||
| 107 | # endif | 109 | # endif |
| 108 | #else | 110 | #else |
| 109 | # undef gettext | 111 | # undef gettext |
| @@ -436,12 +438,6 @@ typedef struct re_dfa_t re_dfa_t; | |||
| 436 | #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx)) | 438 | #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx)) |
| 437 | #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx)) | 439 | #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx)) |
| 438 | 440 | ||
| 439 | #ifdef _LIBC | ||
| 440 | # define MALLOC_0_IS_NONNULL 1 | ||
| 441 | #elif !defined MALLOC_0_IS_NONNULL | ||
| 442 | # define MALLOC_0_IS_NONNULL 0 | ||
| 443 | #endif | ||
| 444 | |||
| 445 | #ifndef MAX | 441 | #ifndef MAX |
| 446 | # define MAX(a,b) ((a) < (b) ? (b) : (a)) | 442 | # define MAX(a,b) ((a) < (b) ? (b) : (a)) |
| 447 | #endif | 443 | #endif |
