From 0fe91fb55ca49830971a57fb04c83def7644c2e1 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 21 Aug 2024 15:16:24 +0200
Subject: [PATCH] libmount: Add integer type headers to private header file

We use uintX_t in many places in the library, and it seems useful to
include inttypes.h and stdint.h to have access to the PRI* macros everywhere.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 libmount/src/btrfs.c      | 1 -
 libmount/src/fuzz.c       | 1 -
 libmount/src/hook_idmap.c | 1 -
 libmount/src/hook_mount.c | 2 --
 libmount/src/mountP.h     | 3 +++
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libmount/src/btrfs.c b/libmount/src/btrfs.c
index a831ce837..eb569f258 100644
--- a/libmount/src/btrfs.c
+++ b/libmount/src/btrfs.c
@@ -15,7 +15,6 @@
 #include <dirent.h>
 #include <sys/ioctl.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <linux/btrfs.h>
 
 #include "mountP.h"
diff --git a/libmount/src/fuzz.c b/libmount/src/fuzz.c
index 2c8471443..f4c0f8ae6 100644
--- a/libmount/src/fuzz.c
+++ b/libmount/src/fuzz.c
@@ -4,7 +4,6 @@
 
 #include <stdlib.h>
 #include <stddef.h>
-#include <stdint.h>
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         struct libmnt_table *tb = NULL;
diff --git a/libmount/src/hook_idmap.c b/libmount/src/hook_idmap.c
index 814b42773..4592f5ef6 100644
--- a/libmount/src/hook_idmap.c
+++ b/libmount/src/hook_idmap.c
@@ -20,7 +20,6 @@
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
-#include <inttypes.h>
 
 #include "strutils.h"
 #include "all-io.h"
diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c
index f87f06816..d33127530 100644
--- a/libmount/src/hook_mount.c
+++ b/libmount/src/hook_mount.c
@@ -48,8 +48,6 @@
 #include "strutils.h"
 #include "linux_version.h"
 
-#include <inttypes.h>
-
 #ifdef USE_LIBMOUNT_MOUNTFD_SUPPORT
 
 #define get_sysapi(_cxt) mnt_context_get_sysapi(_cxt)
diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index da4b60f39..e2381e343 100644
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -23,8 +23,11 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdint.h>
+#include <inttypes.h>
 
 #include "c.h"
+
 #include "list.h"
 #include "debug.h"
 #include "buffer.h"
-- 
2.47.3