From: Alex Richardson <arichardson@FreeBSD.org>
Date: Tue, 9 Aug 2022 10:17:57 +0000 (+0000)
Subject: dbus-sysdeps-util-unix.c: Avoid including sys/syslimits.h
X-Git-Tag: dbus-1.15.0~14^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a214ed824d257b5ab3ea81c8286395e65df81423;p=thirdparty%2Fdbus.git

dbus-sysdeps-util-unix.c: Avoid including sys/syslimits.h

This header is GCC specific header that on my system just contains
`#include_next <limits.h>`. FreeBSD also provides this header but it
contains a `#warning` that it should not be used. Replace the one use
with `#include <limit.h>` and drop the configure checks.
---

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 6ce852041..bb2f021e6 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -25,7 +25,6 @@ check_include_file(sys/random.h     HAVE_SYS_RANDOM_H)
 check_include_file(sys/resource.h     HAVE_SYS_RESOURCE_H)
 check_include_file(sys/syscall.h HAVE_SYS_SYSCALL_H)
 check_include_file(sys/prctl.h  HAVE_SYS_PRCTL_H)
-check_include_file(sys/syslimits.h    HAVE_SYS_SYSLIMITS_H)   # dbus-sysdeps-unix.c
 check_include_file(sys/time.h   HAVE_SYS_TIME_H)# dbus-sysdeps-win.c
 check_include_file(ws2tcpip.h   HAVE_WS2TCPIP_H)# dbus-sysdeps-win.c
 check_include_file(unistd.h     HAVE_UNISTD_H)  # dbus-sysdeps-util-win.c
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index b8d98fb2f..022d190e0 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -124,9 +124,6 @@
 #cmakedefine HAVE_SYS_RANDOM_H 1
 #cmakedefine HAVE_SYS_RESOURCE_H 1
 
-/* Define to 1 if you have sys/syslimits.h */
-#cmakedefine   HAVE_SYS_SYSLIMITS_H 1
-
 /* Define to 1 if you have sys/time.h */
 #cmakedefine    HAVE_SYS_TIME_H 1
 
diff --git a/configure.ac b/configure.ac
index 238b1ac5c..033a1f8ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -423,7 +423,6 @@ sys/prctl.h
 sys/random.h
 sys/resource.h
 sys/syscall.h
-sys/syslimits.h
 sys/time.h
 unistd.h
 winsock2.h
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index c4f1b6339..baf6b8a2f 100644
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -43,6 +43,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <sys/stat.h>
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
@@ -56,10 +57,6 @@
 #include <sys/prctl.h>
 #endif
 
-#ifdef HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
-#endif
-
 #ifdef HAVE_SYSTEMD
 #include <systemd/sd-daemon.h>
 #endif
diff --git a/meson.build b/meson.build
index 034f0ce77..5bc5fb9fc 100644
--- a/meson.build
+++ b/meson.build
@@ -633,7 +633,6 @@ check_headers = [
     'sys/random.h',
     'sys/resource.h',
     'sys/syscall.h',
-    'sys/syslimits.h',
     'sys/time.h',
     'unistd.h',
     'ws2tcpip.h',