From a75c036265819b0997cde7401528495635f7b0ac Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 28 Aug 2026 13:33:07 +0000 Subject: [PATCH] * os/unix/config.m4: Move check for rlim_t here and use AC_CHECK_TYPE. * acinclude.m4: Remove APACHE_TYPE_RLIM_T. GitHub: PR #380 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1937564 13f79535-47bb-0310-9956-ffa450edef68 --- acinclude.m4 | 22 ---------------------- os/unix/config.m4 | 7 ++++++- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 740337de05..27ea1f0025 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -120,28 +120,6 @@ AC_DEFUN([APACHE_GEN_CONFIG_VARS],[ done ]) -dnl -dnl APACHE_TYPE_RLIM_T -dnl -dnl If rlim_t is not defined, define it to int -dnl -AC_DEFUN([APACHE_TYPE_RLIM_T], [ - AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [ - AC_TRY_COMPILE([ -#include -#include -#include -], [rlim_t spoon;], [ - ac_cv_type_rlim_t=yes - ],[ac_cv_type_rlim_t=no - ]) - ]) - if test "$ac_cv_type_rlim_t" = "no" ; then - AC_DEFINE(rlim_t, int, - [Define to 'int' if doesn't define it for us]) - fi -]) - dnl the list of build variables which are available for customization on a dnl per module subdir basis (to be inserted into modules.mk with a "MOD_" dnl prefix, i.e. MOD_CFLAGS etc.). Used in APACHE_MODPATH_{INIT,FINISH}. diff --git a/os/unix/config.m4 b/os/unix/config.m4 index dacbf6b539..a2b443334e 100644 --- a/os/unix/config.m4 +++ b/os/unix/config.m4 @@ -1,5 +1,10 @@ if test "$OS" = "unix" ; then - APACHE_TYPE_RLIM_T + AC_CHECK_TYPE(rlim_t, [], + AC_DEFINE_UNQUOTED(rlim_t, int, + [Define to 'int' if doesn't define it for us]), + [#include +#include +#include ]) AC_CHECK_HEADERS(sys/time.h sys/resource.h sys/sem.h sys/ipc.h)