From: Simon McVittie <smcv@collabora.com>
Date: Tue, 19 Jul 2022 19:34:15 +0000 (+0100)
Subject: build: Remove support for emulating inline with __inline or __inline__
X-Git-Tag: dbus-1.15.0~20^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf30fe6d6068bd00ff4b06e667f88e7ca4210cfe;p=thirdparty%2Fdbus.git

build: Remove support for emulating inline with __inline or __inline__

We now require a (mostly-)C99 compiler, and C99 guarantees the presence
of the inline keyword.

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

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index b70f8390d..96a74f084 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -280,10 +280,6 @@
 #define SIGHUP	1
 #endif
 
-# if defined(_MSC_VER) && !defined(inline)
-#define inline __inline
-#endif
-
 #ifdef DBUS_WIN
 #define FD_SETSIZE @FD_SETSIZE@
 #endif
diff --git a/configure.ac b/configure.ac
index 0c5cdfeab..c4653c693 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,6 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 AC_ISC_POSIX
 AC_HEADER_STDC
-AC_C_INLINE
 AM_PROG_LIBTOOL
 AC_PROG_MKDIR_P
 PKG_PROG_PKG_CONFIG