summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2013-08-09 08:14:31 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2013-08-09 08:14:31 +0000
commit1a29e9e79db8c42162773148a20725c9d7c268fd (patch)
treefd021bbba439cf542748a9e40729c76328d04249
parent735294e854ddca1f9d2636f5f9169f8f1b86816a (diff)
downloadATCD-1a29e9e79db8c42162773148a20725c9d7c268fd.tar.gz
Fri Aug 9 08:14:25 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/os_include/arpa/os_inet.h: * ace/os_include/netinet/os_in.h: * ace/os_include/netinet/os_tcp.h: Include config-lite.h instead of config-all.h to break some circular includes
-rw-r--r--ACE/ChangeLog8
-rw-r--r--ACE/ace/os_include/arpa/os_inet.h2
-rw-r--r--ACE/ace/os_include/netinet/os_in.h2
-rw-r--r--ACE/ace/os_include/netinet/os_tcp.h2
4 files changed, 11 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index d0b8e2b0466..5b92224b4de 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,11 @@
+Fri Aug 9 08:14:25 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/os_include/arpa/os_inet.h:
+ * ace/os_include/netinet/os_in.h:
+ * ace/os_include/netinet/os_tcp.h:
+ Include config-lite.h instead of config-all.h to break some
+ circular includes
+
Fri Aug 9 08:05:09 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/ACE+TAO+CIAO+DAnCE.json:
diff --git a/ACE/ace/os_include/arpa/os_inet.h b/ACE/ace/os_include/arpa/os_inet.h
index 8985f2bbdf2..ab59811ba52 100644
--- a/ACE/ace/os_include/arpa/os_inet.h
+++ b/ACE/ace/os_include/arpa/os_inet.h
@@ -18,7 +18,7 @@
#include /**/ "ace/pre.h"
-#include /**/ "ace/config-all.h"
+#include /**/ "ace/config-lite.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/ACE/ace/os_include/netinet/os_in.h b/ACE/ace/os_include/netinet/os_in.h
index b3ef1e68420..300e885eeb8 100644
--- a/ACE/ace/os_include/netinet/os_in.h
+++ b/ACE/ace/os_include/netinet/os_in.h
@@ -19,7 +19,7 @@
#include /**/ "ace/pre.h"
-#include /**/ "ace/config-all.h"
+#include /**/ "ace/config-lite.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/ACE/ace/os_include/netinet/os_tcp.h b/ACE/ace/os_include/netinet/os_tcp.h
index 9ec1a3bb256..f31647a7dfa 100644
--- a/ACE/ace/os_include/netinet/os_tcp.h
+++ b/ACE/ace/os_include/netinet/os_tcp.h
@@ -18,7 +18,7 @@
#include /**/ "ace/pre.h"
-#include /**/ "ace/config-all.h"
+#include /**/ "ace/config-lite.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once