summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-11-08 14:44:34 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-11-08 14:44:34 +0000
commit47f979e6ecdb649e127d5f1aafa0f4f9a0ae9872 (patch)
treec5afc16d287fb15516106db16caeb0da275c0241
parentdc230c6131305cb932a12b5fed55f56387f3ebfa (diff)
downloadATCD-47f979e6ecdb649e127d5f1aafa0f4f9a0ae9872.tar.gz
ChangeLogTag: Wed Nov 8 14:24:02 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/configure.ac6
2 files changed, 12 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 649d4cfe9a0..0de2794105b 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 8 14:24:02 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * configure.ac:
+
+ Change ACE_LACKS_NET_IF_H feature test to #include <sys/types.h>
+ (if present).
+
Wed Nov 8 13:45:07 UTC 2006 Chad Elliott <elliott_c@ociweb.com>
* examples/C++NPv2/C++NPv2.mpc:
diff --git a/ACE/configure.ac b/ACE/configure.ac
index 3f16fba10ea..8d95e990321 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -627,7 +627,11 @@ ACE_CHECK_LACKS_HEADERS(netinet/tcp.h)
ACE_CHECK_LACKS_HEADERS(sys/socket.h)
ACE_CHECK_LACKS_HEADERS(net/if.h, [], [],
-[#ifndef ACE_LACKS_SYS_SOCKET_H
+[
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifndef ACE_LACKS_SYS_SOCKET_H
# include <sys/socket.h>
# endif
])