From 8ccde6b2cb998a1acb9d8074b25088d839cf658f Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 11 Jul 2020 06:55:28 +0200 Subject: [PATCH] Revert "Keep systems happy which do not have sys/resource.h" This reverts commit f4ba0d4b24301f389dfb76a66094b093125fac9b. --- configure.ac | 2 -- src/ui/gui/main.c | 13 +------------ 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 24cb008fcb..50b7472f9d 100644 --- a/configure.ac +++ b/configure.ac @@ -56,8 +56,6 @@ if test "x$MSGFMT" = x; then PSPP_REQUIRED_PREREQ([msgfmt (is usually provided with gettext)]) fi -AC_CHECK_HEADERS([sys/resource.h]) - dnl Checks for libraries. AC_SYS_LARGEFILE diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c index 9a7f8e1987..ecb07f83ff 100644 --- a/src/ui/gui/main.c +++ b/src/ui/gui/main.c @@ -22,22 +22,11 @@ #include #include #include -#if ENABLE_RELOCATABLE && defined(__APPLE__) #include +#if ENABLE_RELOCATABLE && defined(__APPLE__) static const bool apple_relocatable = true; #else static const bool apple_relocatable = false; -#if HAVE_SYS_RESOURCE_H -#include -#else -/* Dummy definitions to keep the compiler happy. */ -struct rlimit -{ - int rlim_cur; - int rlim_max; -}; -#define RLIMIT_NOFILE 0 -#endif #endif #include "language/lexer/include-path.h" -- 2.30.2