WIP: define a std-lib-compat-util.h and int-types.util.h

steadmon · Jun 11, 2024 · 0617fb3 · 0617fb3
1 parent 0ebed32
commit 0617fb3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/git-compat-util.h b/git-compat-util.h
@@ -290,11 +290,7 @@ static inline int is_xplatform_dir_sep(int c)
 #include <netdb.h>
 #include <pwd.h>
 #include <sys/un.h>
-#ifndef NO_INTTYPES_H
-#include <inttypes.h>
-#else
-#include <stdint.h>
-#endif
+#include "int-types-util.h"
 #ifdef HAVE_ARC4RANDOM_LIBBSD
 #include <bsd/stdlib.h>
 #endif

diff --git a/int-types-util.h b/int-types-util.h
@@ -0,0 +1,10 @@
+#ifndef INT_TYPES_UTIL_H
+#define INT_TYPES_UTIL_H
+
+#ifndef NO_INTTYPES_H
+#include <inttypes.h>
+#else
+#include <stdint.h>
+#endif
+
+#endif
diff --git a/pager.h b/pager.h
@@ -1,8 +1,6 @@
 #ifndef PAGER_H
 #define PAGER_H
 
-#include <stdint.h>
-
 struct child_process;
 
 const char *git_pager(int stdout_is_tty);

diff --git a/std-lib-compat-util.h b/std-lib-compat-util.h
@@ -0,0 +1,6 @@
+#ifndef STD_LIB_COMPAT_UTIL_H
+#define STD_LIB_COMPAT_UTIL_H
+
+#include "int-types-util.h"
+
+#endif
diff --git a/stubs/pager.c b/stubs/pager.c
@@ -1,3 +1,4 @@
+#include "std-lib-compat-util.h"
 #include "pager.h"
 
 int pager_in_use(void)