[Fontconfig] fontconfig: Branch 'main'

[GitLab Mirror]

 fc-list/fc-list.c |   10 +++++-----
 src/fcxml.c       |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit be453bd1590b545d490aa024ef267948419b4d3a
Author: Ryan Gonzalez <ryan.gonzalez at collabora.com>
Date:   Wed Nov 10 19:41:50 2021 -0600

    Ensure config.h is always included before stdlib headers
    
    In particular, if an stdlib header goes first, it includes features.h
    which only checks _FILE_OFFSET_BITS *once*, meaning that these files end
    up compiled *without* _FILE_OFFSET_BITS taking effect, which affects
    fcxml's operations in listing directories.
    
    Signed-off-by: Ryan Gonzalez <ryan.gonzalez at collabora.com>

diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c
index c268ea9..54796c8 100644
--- a/fc-list/fc-list.c
+++ b/fc-list/fc-list.c
@@ -22,11 +22,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <fontconfig/fontconfig.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #else
@@ -35,6 +30,11 @@
 #endif
 #define HAVE_GETOPT 1
 #endif
+#include <fontconfig/fontconfig.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <locale.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/src/fcxml.c b/src/fcxml.c
index 33af948..1ee03cf 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -22,8 +22,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <string.h>
 #include "fcint.h"
+#include <string.h>
 #include <fcntl.h>
 #include <stdarg.h>