summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-06-24 15:19:17 +0000
committerdhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-06-24 15:19:17 +0000
commita6952d0bee7151891ab54ca528ab79f9d35dc7b3 (patch)
treecae2e80774822521b6d1c9dfbb77883f8c8009e8
parentf321c8c15693562e1fa3a52232a2c07e9e04965c (diff)
downloadATCD-a6952d0bee7151891ab54ca528ab79f9d35dc7b3.tar.gz
ChangeLogTag:Tue Jun 24 15:15:03 UTC 2003 Don Hinton <dhinton@dresystems.com>
-rw-r--r--ChangeLog7
-rw-r--r--ace/os_include/sys/os_socket.h7
2 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 7dafda4575b..d2559c5bd4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 24 15:15:03 UTC 2003 Don Hinton <dhinton@dresystems.com>
+
+ * ace/os_include/sys/os_socket.h:
+ Removed ACE_HAS_CYGWIN32_SOCKET_H ifdef that included
+ cygwin32/socket.h, which is no longer needed. Thanks to "Johnny
+ Willemsen" <jwillemsen@remedy.nl> for reporting this.
+
Tue Jun 24 14:40:43 UTC 2003 Don Hinton <dhinton@dresystems.com>
* ace/String_Base.i:
diff --git a/ace/os_include/sys/os_socket.h b/ace/os_include/sys/os_socket.h
index b7e3413fb30..677455f028a 100644
--- a/ace/os_include/sys/os_socket.h
+++ b/ace/os_include/sys/os_socket.h
@@ -26,13 +26,6 @@
#include "ace/os_include/sys/os_uio.h"
-// todo: check to see if this can be removed
-#if defined (ACE_HAS_CYGWIN32_SOCKET_H)
- extern "C" {
-# include /**/ <cygwin32/socket.h>
- }
-#endif /* ACE_HAS_CYGWIN32_SOCKET_H */
-
#if !defined (ACE_LACKS_SYS_SOCKET_H)
# if defined (ACE_HAS_AIX_BROKEN_SOCKET_HEADER)
# undef __cplusplus