diff options
author | Greg Stein <gstein@apache.org> | 2011-05-09 05:28:45 +0000 |
---|---|---|
committer | Greg Stein <gstein@apache.org> | 2011-05-09 05:28:45 +0000 |
commit | a4f51a60806c74430200c19ae35377a8de99c12c (patch) | |
tree | 641db983719306838b127152c89e01d3d04f472b /threadproc/unix/proc.c | |
parent | 232fd91b1e575a87ef3772cd5b377cc3e07a61fb (diff) | |
parent | 023259c8332bbb9ae7f2c4c932d0c7c0b4a98e4f (diff) | |
download | apr-gstein-pocore.tar.gz |
Catch my branch up to the latest 1.3.x branch.gstein-pocore
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/gstein-pocore@1100891 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'threadproc/unix/proc.c')
-rw-r--r-- | threadproc/unix/proc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/threadproc/unix/proc.c b/threadproc/unix/proc.c index 283706cfb..b5e4dd47c 100644 --- a/threadproc/unix/proc.c +++ b/threadproc/unix/proc.c @@ -667,6 +667,7 @@ APR_DECLARE(apr_status_t) apr_proc_wait(apr_proc_t *proc, return errno; } +#if APR_HAVE_STRUCT_RLIMIT APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr, apr_int32_t what, struct rlimit *limit) @@ -681,7 +682,7 @@ APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr, #endif case APR_LIMIT_MEM: -#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined(RLIMIT_AS) +#if defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_AS) attr->limit_mem = limit; break; #else @@ -708,3 +709,5 @@ APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr, return APR_SUCCESS; } +#endif /* APR_HAVE_STRUCT_RLIMIT */ + |