From df10b7d5800b5a4418a72d76fc99b6b533f36314 Mon Sep 17 00:00:00 2001 From: Paul Millar Date: Sun, 16 Jul 2006 15:06:28 +0100 Subject: [PATCH] libwine: Add a configure check for setrlimit. --- configure | 2 ++ configure.ac | 1 + include/config.h.in | 3 +++ libs/wine/loader.c | 6 ++++++ 4 files changed, 12 insertions(+) diff --git a/configure b/configure index f1e9b2551f3..a03a85c0549 100755 --- a/configure +++ b/configure @@ -19377,6 +19377,7 @@ fi + for ac_func in \ @@ -19428,6 +19429,7 @@ for ac_func in \ sched_yield \ select \ sendmsg \ + setrlimit \ settimeofday \ sigaltstack \ sigprocmask \ diff --git a/configure.ac b/configure.ac index 0904a603e90..7894a573d81 100644 --- a/configure.ac +++ b/configure.ac @@ -1309,6 +1309,7 @@ AC_CHECK_FUNCS(\ sched_yield \ select \ sendmsg \ + setrlimit \ settimeofday \ sigaltstack \ sigprocmask \ diff --git a/include/config.h.in b/include/config.h.in index e1c5692db8c..48c047db980 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -587,6 +587,9 @@ /* Define to 1 if you have the `sendmsg' function. */ #undef HAVE_SENDMSG +/* Define to 1 if you have the `setrlimit' function. */ +#undef HAVE_SETRLIMIT + /* Define to 1 if you have the `settimeofday' function. */ #undef HAVE_SETTIMEOFDAY diff --git a/libs/wine/loader.c b/libs/wine/loader.c index adbadd59783..4406a32f939 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -608,6 +608,7 @@ int wine_dll_get_owner( const char *name, char *buffer, int size, int *exists ) */ static void set_max_limit( int limit ) { +#ifdef HAVE_SETRLIMIT struct rlimit rlimit; if (!getrlimit( limit, &rlimit )) @@ -615,6 +616,7 @@ static void set_max_limit( int limit ) rlimit.rlim_cur = rlimit.rlim_max; setrlimit( limit, &rlimit ); } +#endif } @@ -631,8 +633,12 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) void (*init_func)(void); /* force a few limits that are set too low on some platforms */ +#ifdef RLIMIT_NOFILE set_max_limit( RLIMIT_NOFILE ); +#endif +#ifdef RLIMIT_AS set_max_limit( RLIMIT_AS ); +#endif wine_init_argv0_path( argv[0] ); build_dll_path();