fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 meson.build |    1 +
 src/fcmd5.h |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a1100cebc066651bb4cedaefc46dd66a5da618eb
Merge: d9342a6 7c08295
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Jan 27 03:27:31 2025 +0000

    Merge branch 'meson-endianness' into 'main'
    
    meson: set WORDS_BIGENDIAN
    
    Closes #446
    
    See merge request fontconfig/fontconfig!362

commit 7c082953381038d5c35820cba939047d708bbb5a
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Jan 27 11:24:19 2025 +0900

    meson: set WORDS_BIGENDIAN
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/446

diff --git a/meson.build b/meson.build
index 9e9993a..5aacfc5 100644
--- a/meson.build
+++ b/meson.build
@@ -181,6 +181,7 @@ conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 conf.set_quoted('PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), meson.project_version()))
 conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new')
 conf.set_quoted('PACKAGE_URL', '')
+conf.set('WORDS_BIGENDIAN', (host_machine.endian() == 'big').to_int())
 
 if host_machine.system() == 'windows'
   conf.set('EXEEXT', '.exe')
diff --git a/src/fcmd5.h b/src/fcmd5.h
index 7e8a6e1..bf50728 100644
--- a/src/fcmd5.h
+++ b/src/fcmd5.h
@@ -27,7 +27,7 @@ static void MD5Update(struct MD5Context *ctx, const unsigned char *buf, unsigned
 static void MD5Final(unsigned char digest[16], struct MD5Context *ctx);
 static void MD5Transform(FcChar32 buf[4], FcChar32 in[16]);
 
-#ifndef WORDS_BIGENDIAN
+#if !defined(WORDS_BIGENDIAN) || !WORDS_BIGENDIAN
 #define byteReverse(buf, len)	/* Nothing */
 #else
 /*