diff options
| author | Olli Savia <ops@iki.fi> | 2011-04-14 07:59:18 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2011-04-14 07:59:18 +0000 |
| commit | 508f5799dbe388ddf543ea958ce5dafb0c917121 (patch) | |
| tree | b9575074da15c498611254efbf7726e55c53a2ca | |
| parent | 69281b21ce42363ac6253866951a18d0046271b4 (diff) | |
| download | ATCD-508f5799dbe388ddf543ea958ce5dafb0c917121.tar.gz | |
ChangeLogTag: Thu Apr 14 07:58:19 UTC 2011 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/ACE.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/config-lynxos.h | 1 | ||||
| -rw-r--r-- | ACE/ace/os_include/sys/os_resource.h | 11 |
4 files changed, 8 insertions, 13 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index b63a4ff8ccb..aed6fe0d936 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Thu Apr 14 07:58:19 UTC 2011 Olli Savia <ops@iki.fi> + + * ace/ACE.cpp: + * ace/config-lynxos.h: + * ace/os_include/sys/os_resource.h: + Removed legacy rlimit related settings. + Wed Apr 13 13:29:13 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com> * tests/Bug_3943_Regression_Test.cpp: diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 22d8bc24bb1..26928defce8 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -2853,7 +2853,7 @@ ACE::set_handle_limit (int new_limit, #if !defined (ACE_LACKS_RLIMIT) && defined (RLIMIT_NOFILE) rl.rlim_cur = new_limit; return ACE_OS::setrlimit (RLIMIT_NOFILE, &rl); -#elif defined (ACE_LACKS_RLIMIT_NOFILE) +#elif !defined (RLIMIT_NOFILE) return 0; #else // Must return EINVAL errno. diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h index ee1b8fed14a..ff8a10bb67a 100644 --- a/ACE/ace/config-lynxos.h +++ b/ACE/ace/config-lynxos.h @@ -102,7 +102,6 @@ #define ACE_LACKS_MADVISE #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS #define ACE_LACKS_REALPATH -#define ACE_LACKS_RLIMIT_NOFILE #define ACE_LACKS_SCANDIR_PROTOTYPE #define ACE_LACKS_SIGINFO_H #define ACE_LACKS_STRPTIME diff --git a/ACE/ace/os_include/sys/os_resource.h b/ACE/ace/os_include/sys/os_resource.h index 5ec68e752de..bac9ee81869 100644 --- a/ACE/ace/os_include/sys/os_resource.h +++ b/ACE/ace/os_include/sys/os_resource.h @@ -50,17 +50,6 @@ extern "C" { #endif /* __cplusplus */ -// There must be a better way to do this... -#if !defined (RLIMIT_NOFILE) && !defined (ACE_LACKS_RLIMIT_NOFILE) -# if defined (linux) || defined (AIX) -# if defined (RLIMIT_OFILE) -# define RLIMIT_NOFILE RLIMIT_OFILE -# else -# define RLIMIT_NOFILE 200 -# endif /* RLIMIT_OFILE */ -# endif /* defined (linux) || defined (AIX) */ -#endif /* RLIMIT_NOFILE */ - #if defined (ACE_WIN32) # define RUSAGE_SELF 1 /// Fake the UNIX rusage structure. Perhaps we can add more to this |