fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 src/fcint.h |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit eb826a83f8d2b4d7a148058c9c2312a7cb890f6f
Merge: d9580de c1067aa
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Jun 27 02:29:08 2025 +0000

    Merge branch 'fix-dgettext-conflict' into 'main'
    
    Avoid conflict between dgettext macro and declaration in fcint.h
    
    Closes #470
    
    See merge request fontconfig/fontconfig!444

commit c1067aa2db49c0e6dd3400e2722c0900fc4408d1
Author: Albert Lee <trisk at forkgnu.org>
Date:   Tue May 20 21:03:02 2025 +0000

    Avoid conflict between dgettext macro and declaration in fcint.h
    
    Ensure <locale.h>, which may declare dgettext, is included prior to
    defining dgettext as a macro when NLS is disabled.
    
    This happens on Solaris-based distro.
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/470
    
    Changelog: fixed

diff --git a/src/fcint.h b/src/fcint.h
index 08ebc71..8046cc8 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -138,6 +138,8 @@ extern pfnSHGetFolderPathA          pSHGetFolderPathA;
 #  include <libintl.h>
 #  define _(x) (dgettext (GETTEXT_PACKAGE, x))
 #else
+/* dgettext macro must be defined after existing declarations */
+#  include <locale.h>
 #  define dgettext(d, s) (s)
 #  define _(x)           (x)
 #endif