Skip to content

Commit 6c38a38

Browse files
committed
* os/unix/config.m4: Move check for rlim_t here and use AC_CHECK_TYPE.
* acinclude.m4: Remove APACHE_TYPE_RLIM_T.
1 parent 7bc2635 commit 6c38a38

2 files changed

Lines changed: 6 additions & 23 deletions

File tree

acinclude.m4

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -120,28 +120,6 @@ AC_DEFUN([APACHE_GEN_CONFIG_VARS],[
120120
done
121121
])
122122

123-
dnl
124-
dnl APACHE_TYPE_RLIM_T
125-
dnl
126-
dnl If rlim_t is not defined, define it to int
127-
dnl
128-
AC_DEFUN([APACHE_TYPE_RLIM_T], [
129-
AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [
130-
AC_TRY_COMPILE([
131-
#include <sys/types.h>
132-
#include <sys/time.h>
133-
#include <sys/resource.h>
134-
], [rlim_t spoon;], [
135-
ac_cv_type_rlim_t=yes
136-
],[ac_cv_type_rlim_t=no
137-
])
138-
])
139-
if test "$ac_cv_type_rlim_t" = "no" ; then
140-
AC_DEFINE(rlim_t, int,
141-
[Define to 'int' if <sys/resource.h> doesn't define it for us])
142-
fi
143-
])
144-
145123
dnl the list of build variables which are available for customization on a
146124
dnl per module subdir basis (to be inserted into modules.mk with a "MOD_"
147125
dnl prefix, i.e. MOD_CFLAGS etc.). Used in APACHE_MODPATH_{INIT,FINISH}.

os/unix/config.m4

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
if test "$OS" = "unix" ; then
2-
APACHE_TYPE_RLIM_T
2+
AC_CHECK_TYPE(rlim_t, [],
3+
AC_DEFINE_UNQUOTED(rlim_t, int,
4+
[Define to 'int' if <sys/resource.h> doesn't define it for us]),
5+
[#include <sys/types.h>
6+
#include <sys/time.h>
7+
#include <sys/resource.h>])
38

49
AC_CHECK_HEADERS(sys/time.h sys/resource.h sys/sem.h sys/ipc.h)
510

0 commit comments

Comments
 (0)