diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:58 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:58 +0100 |
| commit | 9853b168f68cbb09b75a817343cedde2aca4c76c (patch) | |
| tree | db628840acea83dbccaf5676b89579a80e02ef51 /lib/unilbrk/ulc-width-linebreaks.c | |
| parent | d83e85a2e6064c36f6ad3c848e39d8b8c101c4f7 (diff) | |
| parent | 7cf710f6587e71a193a55d84dd6d8ae1a8a69ce0 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'lib/unilbrk/ulc-width-linebreaks.c')
| -rw-r--r-- | lib/unilbrk/ulc-width-linebreaks.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/unilbrk/ulc-width-linebreaks.c b/lib/unilbrk/ulc-width-linebreaks.c index dc72306c..bae6a57f 100644 --- a/lib/unilbrk/ulc-width-linebreaks.c +++ b/lib/unilbrk/ulc-width-linebreaks.c @@ -1,5 +1,5 @@ /* Line breaking of strings. - Copyright (C) 2001-2003, 2006-2022 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2006-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This file is free software. @@ -151,7 +151,10 @@ ulc_width_linebreaks_internal (const char *s, size_t n, return start_column; } -#undef ulc_width_linebreaks +#if defined IN_LIBUNISTRING +/* For backward compatibility with older versions of libunistring. */ + +# undef ulc_width_linebreaks int ulc_width_linebreaks (const char *s, size_t n, @@ -164,6 +167,8 @@ ulc_width_linebreaks (const char *s, size_t n, o, encoding, -1, p); } +#endif + int ulc_width_linebreaks_v2 (const char *s, size_t n, int width, int start_column, int at_end_columns, |