From ec0a28d7fa5faeba5045e3537695d1053db37e1e Mon Sep 17 00:00:00 2001
From: olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Tue, 22 Mar 2011 09:24:25 +0000
Subject: ChangeLogTag: Tue Mar 22 09:18:44 UTC 2011  Olli Savia  <ops@iki.fi>

---
 ACE/ChangeLog           | 13 ++++++++-----
 ACE/ace/config-lynxos.h |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a69895f4802..66ad8f8286f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,16 +1,21 @@
+Tue Mar 22 09:18:44 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * ace/config-lynxos.h:
+          Reverted: Mon Mar 21 16:10:05 UTC 2011  Olli Savia  <ops@iki.fi>
+          Put back ACE_LACKS_RLIMIT_NOFILE. The problem with LynxOS 4.2
+          seems to be rlimit.
+
 Mon Mar 21 20:40:36 UTC 2011  James Edmondson  <james.r.edmondson@vanderbilt.edu>
 
         * bin/fuzz.pl:
-          Commented out lines that may be used for debugging the 
+          Commented out lines that may be used for debugging the
           trace error checker
 
-
 Mon Mar 21 20:18:52 UTC 2011  James Edmondson  <james.r.edmondson@vanderbilt.edu>
 
         * bin/fuzz.pl:
           Reverted previous changes
 
-
 Mon Mar 21 19:07:52 UTC 2011  James Edmondson  <james.r.edmondson@vanderbilt.edu>
 
         * bin/fuzz.pl:
@@ -18,13 +23,11 @@ Mon Mar 21 19:07:52 UTC 2011  James Edmondson  <james.r.edmondson@vanderbilt.edu
           Stopped fuzz.pl from considering *C.* and *S.* generated files
           Stopped fuzz.pl from considering *_export.h
 
-
 Mon Mar 21 19:02:57 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * html/Stats/index.shtml:
           Playstation xampler results are not available anymore
 
-
 Mon Mar 21 16:10:05 UTC 2011  Olli Savia  <ops@iki.fi>
 
         * ace/config-lynxos.h:
diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h
index a467db9ed04..9495ad4fda0 100644
--- a/ACE/ace/config-lynxos.h
+++ b/ACE/ace/config-lynxos.h
@@ -101,11 +101,11 @@
 #define ACE_LACKS_ISCTYPE
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
+#define ACE_LACKS_RLIMIT_NOFILE
 #define ACE_LACKS_SCANDIR_PROTOTYPE
 #define ACE_LACKS_SIGINFO_H
 #define ACE_LACKS_STRPTIME
 #define ACE_LACKS_SUSECONDS_T
-#define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_LACKS_TIMESPEC_T
 #define ACE_LACKS_UCONTEXT_H
 
@@ -129,12 +129,12 @@
 #  define ACE_LACKS_INET_ATON_PROTOTYPE
 #  define ACE_LACKS_PTHREAD_ATTR_SETSTACKADDR
 #  define ACE_LACKS_REGEX_H
-#  define ACE_LACKS_RLIMIT_NOFILE
 #  define ACE_LACKS_RWLOCK_T
 #  define ACE_LACKS_SETDETACH
 #  define ACE_LACKS_STRCASECMP_PROTOTYPE
 #  define ACE_LACKS_STRNCASECMP_PROTOTYPE
 #  define ACE_LACKS_SYS_SELECT_H
+#  define ACE_LACKS_THREAD_PROCESS_SCOPING
 #endif
 
 #if (ACE_LYNXOS_MAJOR > 4) || (ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR >= 2)
-- 
cgit v1.2.1