From 8cffe412eadd2d9f22ed8ee114b72cc8c6dbfa14 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Wed, 11 Jun 2025 14:09:32 +0300
Subject: [PATCH] Include config.h before all other headers.

The defines in config.h may affect OS and FUSE API and ABI, so make sure
to include it before everything else.
---
 attrib/Makefile.am   | 2 +-
 dump/Makefile.am     | 2 +-
 fsck/Makefile.am     | 2 +-
 fuse/Makefile.am     | 2 +-
 label/Makefile.am    | 2 +-
 libexfat/Makefile.am | 1 +
 libexfat/exfat.h     | 4 ----
 mkfs/Makefile.am     | 2 +-
 8 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/attrib/Makefile.am b/attrib/Makefile.am
index d4ea06c..23cff30 100644
--- a/attrib/Makefile.am
+++ b/attrib/Makefile.am
@@ -23,6 +23,6 @@
 sbin_PROGRAMS = exfatattrib
 dist_man8_MANS = exfatattrib.8
 exfatattrib_SOURCES = main.c
-exfatattrib_CPPFLAGS = -I$(top_srcdir)/libexfat
+exfatattrib_CPPFLAGS = -imacros $(top_srcdir)/libexfat/config.h
 exfatattrib_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS)
 exfatattrib_LDADD = $(top_srcdir)/libexfat/libexfat.a $(UBLIO_LIBS)
diff --git a/dump/Makefile.am b/dump/Makefile.am
index 5f7e396..8fcb0d0 100644
--- a/dump/Makefile.am
+++ b/dump/Makefile.am
@@ -23,6 +23,6 @@
 sbin_PROGRAMS = dumpexfat
 dist_man8_MANS = dumpexfat.8
 dumpexfat_SOURCES = main.c
-dumpexfat_CPPFLAGS = -I$(top_srcdir)/libexfat
+dumpexfat_CPPFLAGS = -imacros $(top_srcdir)/libexfat/config.h
 dumpexfat_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS)
 dumpexfat_LDADD = $(top_srcdir)/libexfat/libexfat.a $(UBLIO_LIBS)
diff --git a/fsck/Makefile.am b/fsck/Makefile.am
index 1694564..55134e2 100644
--- a/fsck/Makefile.am
+++ b/fsck/Makefile.am
@@ -23,7 +23,7 @@
 sbin_PROGRAMS = exfatfsck
 dist_man8_MANS = exfatfsck.8
 exfatfsck_SOURCES = main.c
-exfatfsck_CPPFLAGS = -I$(top_srcdir)/libexfat
+exfatfsck_CPPFLAGS = -imacros $(top_srcdir)/libexfat/config.h
 exfatfsck_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS)
 exfatfsck_LDADD = $(top_srcdir)/libexfat/libexfat.a $(UBLIO_LIBS)
 
diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index 3eeaab7..09c8cac 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -23,7 +23,7 @@
 sbin_PROGRAMS = mount.exfat-fuse
 dist_man8_MANS = mount.exfat-fuse.8
 mount_exfat_fuse_SOURCES = main.c
-mount_exfat_fuse_CPPFLAGS = -I$(top_srcdir)/libexfat
+mount_exfat_fuse_CPPFLAGS = -imacros $(top_srcdir)/libexfat/config.h
 mount_exfat_fuse_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS)
 mount_exfat_fuse_LDADD = $(top_srcdir)/libexfat/libexfat.a $(FUSE2_LIBS) $(FUSE3_LIBS) $(UBLIO_LIBS)
 
diff --git a/label/Makefile.am b/label/Makefile.am
index 612cef1..44fc08b 100644
--- a/label/Makefile.am
+++ b/label/Makefile.am
@@ -23,6 +23,6 @@
 sbin_PROGRAMS = exfatlabel
 dist_man8_MANS = exfatlabel.8
 exfatlabel_SOURCES = main.c
-exfatlabel_CPPFLAGS = -I$(top_srcdir)/libexfat
+exfatlabel_CPPFLAGS = -imacros $(top_srcdir)/libexfat/config.h
 exfatlabel_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS)
 exfatlabel_LDADD = $(top_srcdir)/libexfat/libexfat.a $(UBLIO_LIBS)
diff --git a/libexfat/Makefile.am b/libexfat/Makefile.am
index d2ac7ae..364b577 100644
--- a/libexfat/Makefile.am
+++ b/libexfat/Makefile.am
@@ -37,4 +37,5 @@ libexfat_a_SOURCES = \
 	time.c \
 	utf.c \
 	utils.c
+libexfat_a_CPPFLAGS = -imacros $(top_srcdir)/libexfat/config.h
 libexfat_a_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS)
diff --git a/libexfat/exfat.h b/libexfat/exfat.h
index 0e146e8..9b9a682 100644
--- a/libexfat/exfat.h
+++ b/libexfat/exfat.h
@@ -24,10 +24,6 @@
 #ifndef EXFAT_H_INCLUDED
 #define EXFAT_H_INCLUDED
 
-#ifndef ANDROID
-/* Android.bp is used instead of autotools when targeting Android */
-#include "config.h"
-#endif
 #include "compiler.h"
 #include "exfatfs.h"
 #include <stdio.h>
diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
index 50d1351..26fcd16 100644
--- a/mkfs/Makefile.am
+++ b/mkfs/Makefile.am
@@ -38,7 +38,7 @@ mkexfatfs_SOURCES = \
 	uctc.h \
 	vbr.c \
 	vbr.h
-mkexfatfs_CPPFLAGS = -I$(top_srcdir)/libexfat
+mkexfatfs_CPPFLAGS = -imacros $(top_srcdir)/libexfat/config.h
 mkexfatfs_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS)
 mkexfatfs_LDADD = $(top_srcdir)/libexfat/libexfat.a $(UBLIO_LIBS)