summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Savia <ops@iki.fi>2005-05-24 05:03:40 +0000
committerOlli Savia <ops@iki.fi>2005-05-24 05:03:40 +0000
commit3c80207ef16a12e5cdfb1318707fe0a332d98603 (patch)
treef074fda674cd6901ac139a4e9092951999149ed4
parent711701c42d16c84440b025ef6488785cbbe0036b (diff)
downloadATCD-3c80207ef16a12e5cdfb1318707fe0a332d98603.tar.gz
ChangeLogTag: Tue May 24 07:58:09 2005 Olli Savia <ops@iki.fi>
-rw-r--r--ChangeLog39
-rw-r--r--ace/SSL/SSL_SOCK_Stream.h3
2 files changed, 26 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 56c85f5a0f6..2b219ed92e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue May 24 07:58:09 2005 Olli Savia <ops@iki.fi>
+
+ * ace/SSL/SSL_SOCK_Stream.h:
+ Added include "ace/os_include/os_stdio.h" to fix compile
+ problem on LynxOS. Thanks to Christine Ballard
+ <christine.ballard at lmco dot com> for reporting the problem.
+
Mon May 23 23:11:14 2005 Emre Turkay <turkaye@dre.vanderbilt.edu>
* contrib/utility/*:
@@ -6,19 +13,19 @@ Mon May 23 23:11:14 2005 Emre Turkay <turkaye@dre.vanderbilt.edu>
Mon May 23 16:38:13 2005 Steve Huston <shuston@riverace.com>
- * examples/Reactor/Proactor/post_completions.cpp: Made use of the
- ACE_POSIX_SIG_Proactor-based test dependent on
- ACE_HAS_POSIX_REALTIME_SIGNALS, not ACE_POSIX_SIG_PROACTOR.
- ACE_POSIX_SIG_PROACTOR indicates a preference for that proactor
- implementation when one is not specified; it's not a capability
- indicator. The presence of the ACE_POSIX_SIG_Proactor implementation
- is based on the ACE_HAS_POSIX_REALTIME_SIGNALS setting, so that's
- what's used to decide whether to explicitly use
- ACE_POSIX_SIG_Proactor. This fixes a build error on Mac OS X Tiger
- with autoconfigure, as well as any other platform with AIO
- support that doesn't declare a Proactor implementation preference.
- Thanks to J.T. Conklin for raising this issue and working on testing
- fixes.
+ * examples/Reactor/Proactor/post_completions.cpp: Made use of the
+ ACE_POSIX_SIG_Proactor-based test dependent on
+ ACE_HAS_POSIX_REALTIME_SIGNALS, not ACE_POSIX_SIG_PROACTOR.
+ ACE_POSIX_SIG_PROACTOR indicates a preference for that proactor
+ implementation when one is not specified; it's not a capability
+ indicator. The presence of the ACE_POSIX_SIG_Proactor implementation
+ is based on the ACE_HAS_POSIX_REALTIME_SIGNALS setting, so that's
+ what's used to decide whether to explicitly use
+ ACE_POSIX_SIG_Proactor. This fixes a build error on Mac OS X Tiger
+ with autoconfigure, as well as any other platform with AIO
+ support that doesn't declare a Proactor implementation preference.
+ Thanks to J.T. Conklin for raising this issue and working on testing
+ fixes.
Mon May 23 14:52:19 2005 Justin Michel <michel_j@ociweb.com>
@@ -33,7 +40,7 @@ Mon May 23 13:02:25 2005 Justin Michel <michel_j@ociweb.com>
Added new ACEXML_escape_string() functions to allow replacement of
illegal characters, (', ", &, <, >, etc.) with the escaped versions.
- (&quot;, &lt;, etc.)
+ (&quot;, &lt;, etc.)
* ACEXML/tests/util/test.cpp:
* ACEXML/tests/util/util.mpc:
@@ -45,8 +52,8 @@ Mon May 23 13:02:25 2005 Justin Michel <michel_j@ociweb.com>
* ace/String_Base.inl:
* ace/String_Base.cpp:
- Fixed some documentation bugs, and added some new features to
- this class.
+ Fixed some documentation bugs, and added some new features to
+ this class.
New efficient overloads for string concatenation.
Fixed clear(1) to work as documented.
Used a more optimal string growth when concatenating strings.
diff --git a/ace/SSL/SSL_SOCK_Stream.h b/ace/SSL/SSL_SOCK_Stream.h
index 4d905e486e9..abace05d58f 100644
--- a/ace/SSL/SSL_SOCK_Stream.h
+++ b/ace/SSL/SSL_SOCK_Stream.h
@@ -24,6 +24,9 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+// This must be included before any <openssl> include on LynxOS
+#include "ace/os_include/os_stdio.h"
+
#include <openssl/err.h>
#include "SSL_SOCK.h"