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/uninorm.in.h | |
| parent | d83e85a2e6064c36f6ad3c848e39d8b8c101c4f7 (diff) | |
| parent | 7cf710f6587e71a193a55d84dd6d8ae1a8a69ce0 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'lib/uninorm.in.h')
| -rw-r--r-- | lib/uninorm.in.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/uninorm.in.h b/lib/uninorm.in.h index 804e4acf..14c1576c 100644 --- a/lib/uninorm.in.h +++ b/lib/uninorm.in.h @@ -1,5 +1,5 @@ /* Normalization forms (composition and decomposition) of Unicode strings. - Copyright (C) 2001-2002, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This file is free software: you can redistribute it and/or modify @@ -21,14 +21,17 @@ /* Get common macros for C. */ #include <unistring/cdefs.h> -/* Get LIBUNISTRING_DLL_VARIABLE. */ -#include <unistring/woe32dll.h> - /* Get size_t. */ #include <stddef.h> #include "unitypes.h" +#if @HAVE_UNISTRING_WOE32DLL_H@ +# include <unistring/woe32dll.h> +#else +# define LIBUNISTRING_DLL_VARIABLE +#endif + #ifdef __cplusplus extern "C" { @@ -114,21 +117,21 @@ struct unicode_normalization_form; typedef const struct unicode_normalization_form *uninorm_t; /* UNINORM_NFD: Normalization form D: canonical decomposition. */ -extern LIBUNISTRING_DLL_VARIABLE const struct unicode_normalization_form uninorm_nfd; +extern @GNULIB_UNINORM_NFD_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfd; #define UNINORM_NFD (&uninorm_nfd) /* UNINORM_NFC: Normalization form C: canonical decomposition, then canonical composition. */ -extern LIBUNISTRING_DLL_VARIABLE const struct unicode_normalization_form uninorm_nfc; +extern @GNULIB_UNINORM_NFC_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfc; #define UNINORM_NFC (&uninorm_nfc) /* UNINORM_NFKD: Normalization form KD: compatibility decomposition. */ -extern LIBUNISTRING_DLL_VARIABLE const struct unicode_normalization_form uninorm_nfkd; +extern @GNULIB_UNINORM_NFKD_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfkd; #define UNINORM_NFKD (&uninorm_nfkd) /* UNINORM_NFKC: Normalization form KC: compatibility decomposition, then canonical composition. */ -extern LIBUNISTRING_DLL_VARIABLE const struct unicode_normalization_form uninorm_nfkc; +extern @GNULIB_UNINORM_NFKC_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfkc; #define UNINORM_NFKC (&uninorm_nfkc) /* Test whether a normalization form does compatibility decomposition. */ |