summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcorino <mcorino@users.noreply.github.com>2005-08-19 09:06:15 +0000
committermcorino <mcorino@users.noreply.github.com>2005-08-19 09:06:15 +0000
commitdf852cf535b822e53558fd8996209f12587e0f7f (patch)
treece588d40568dd912e26d45a6263b867bb58286bf
parentbc2d41f432707775fc5f9113ba44e363265352ec (diff)
downloadATCD-df852cf535b822e53558fd8996209f12587e0f7f.tar.gz
ChangeLogTag: Fri Aug 19 09:04:12 UTC 2005 Martin Corino <mcorino@remedy.nl>
-rw-r--r--ChangeLog9
-rw-r--r--ace/SOCK_Connector.cpp1
-rw-r--r--ace/Sock_Connect.cpp1
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 982b574cf52..f6062b92c7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Aug 19 09:04:12 UTC 2005 Martin Corino <mcorino@remedy.nl>
+
+ * ace/Socket_Connect.cpp:
+ Added include of OS_NS_stdio.h since some builds otherwise miss out
+ on things like ACE_OS::fopen() and such (now for real).
+
+ * ace/SOCK_Connector.cpp:
+ Reverted change which was meant for Sock_Connect.cpp:-(
+
Fri Aug 19 08:40:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-win32-msvc-7.h:
diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp
index 1923211de9e..86c09b92f1d 100644
--- a/ace/SOCK_Connector.cpp
+++ b/ace/SOCK_Connector.cpp
@@ -6,7 +6,6 @@
#include "ace/Log_Msg.h"
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_sys_socket.h"
-#include "ace/OS_NS_stdio.h"
#include "ace/os_include/os_fcntl.h"
#if !defined (ACE_HAS_WINCE)
diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp
index d88e503192b..e485f04fb16 100644
--- a/ace/Sock_Connect.cpp
+++ b/ace/Sock_Connect.cpp
@@ -7,6 +7,7 @@
#include "ace/Auto_Ptr.h"
#include "ace/SString.h"
#include "ace/OS_Memory.h"
+#include "ace/OS_NS_stdio.h"
#if defined (sparc) && ! defined (CHORUS)
# include "ace/OS_NS_fcntl.h"