From: Simon McVittie <smcv@collabora.com>
Date: Tue, 19 Jul 2022 19:44:58 +0000 (+0100)
Subject: build: Assume stdint.h is provided
X-Git-Tag: dbus-1.15.0~20^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98eff5513ea8a3523c05a93abd28d64a89e6fb80;p=thirdparty%2Fdbus.git

build: Assume stdint.h is provided

We now require a (mostly-)C99 compiler, meaning we can rely on having
Standard C stdint.h.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 3d4e0f2be..6ce852041 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -17,7 +17,6 @@ check_include_file(io.h         HAVE_IO_H)      # internal
 check_include_file(linux/close_range.h HAVE_LINUX_CLOSE_RANGE_H)
 check_include_file(locale.h     HAVE_LOCALE_H)
 check_include_file(signal.h     HAVE_SIGNAL_H)
-check_include_file(stdint.h     HAVE_STDINT_H)   # dbus-pipe.h
 check_include_file(stdio.h      HAVE_STDIO_H)   # dbus-sysdeps.h
 check_include_file(syslog.h     HAVE_SYSLOG_H)
 check_include_files("stdint.h;sys/types.h;sys/event.h" HAVE_SYS_EVENT_H)
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 889921493..b8d98fb2f 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -114,9 +114,6 @@
 /* Define to 1 if you have signal.h */
 #cmakedefine   HAVE_SIGNAL_H 1
 
-/* Define to 1 if you have stdint.h */
-#cmakedefine   HAVE_STDINT_H 1
-
 /* Define to 1 if you have stdio.h */
 #cmakedefine   HAVE_STDIO_H 1
 
diff --git a/configure.ac b/configure.ac
index 73ca1d23c..238b1ac5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -419,7 +419,6 @@ errno.h
 linux/close_range.h
 locale.h
 signal.h
-stdint.h
 sys/prctl.h
 sys/random.h
 sys/resource.h
diff --git a/dbus/dbus-hash.h b/dbus/dbus-hash.h
index ea6fef0d4..dc36633a7 100644
--- a/dbus/dbus-hash.h
+++ b/dbus/dbus-hash.h
@@ -24,9 +24,7 @@
 #ifndef DBUS_HASH_H
 #define DBUS_HASH_H
 
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
diff --git a/dbus/dbus-pipe.h b/dbus/dbus-pipe.h
index 637d29ea4..a0ff072b4 100644
--- a/dbus/dbus-pipe.h
+++ b/dbus/dbus-pipe.h
@@ -25,9 +25,7 @@
 #ifndef DBUS_PIPE_H
 #define DBUS_PIPE_H
 
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 5270a5dec..7023ea716 100644
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -30,9 +30,7 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
diff --git a/meson.build b/meson.build
index a97e90cf1..c6dbb578f 100644
--- a/meson.build
+++ b/meson.build
@@ -617,7 +617,6 @@ check_headers = [
     'linux/close_range.h',
     'locale.h',
     'signal.h',
-    'stdint.h',
     'syslog.h',
     'sys/prctl.h',
     'sys/random.h',