BIND 10 master, updated. 0f1e080b028eb0ef89f88ba41ffc8e701888a8f6 [master]Merge branch 'trac1644'

[BIND 10 source code commits]

The branch, master has been updated
       via  0f1e080b028eb0ef89f88ba41ffc8e701888a8f6 (commit)
       via  9a25a7d76337270c5a555bd98cba95a2fb7d7295 (commit)
       via  572cd0d4d2866708af03a0413cac704b98e5538a (commit)
       via  3d8ac71299d439906a11820e4ef914eb18b9d1d3 (commit)
       via  78c0ce22b39230347bc652f7903aac57d2b4c577 (commit)
      from  8e3c36663ec9ee59b710e97a1f6716fb59df1d51 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0f1e080b028eb0ef89f88ba41ffc8e701888a8f6
Merge: 8e3c36663ec9ee59b710e97a1f6716fb59df1d51 9a25a7d76337270c5a555bd98cba95a2fb7d7295
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Thu Mar 15 13:23:39 2012 -0500

    [master]Merge branch 'trac1644'

-----------------------------------------------------------------------

Summary of changes:
 src/lib/asiodns/dns_service.cc     |    3 +--
 src/lib/asiodns/io_fetch.cc        |    3 +--
 src/lib/asiodns/tcp_server.cc      |    3 +--
 src/lib/asiodns/udp_server.cc      |    3 +--
 src/lib/asiolink/io_service.cc     |    3 +--
 src/lib/resolve/recursive_query.cc |    3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/asiodns/dns_service.cc b/src/lib/asiodns/dns_service.cc
index d79363d..5637bf5 100644
--- a/src/lib/asiodns/dns_service.cc
+++ b/src/lib/asiodns/dns_service.cc
@@ -14,10 +14,9 @@
 
 #include <config.h>
 
-#include <sys/types.h>
+#include <unistd.h>             // for some IPC/network system calls
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <unistd.h>             // for some IPC/network system calls
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/src/lib/asiodns/io_fetch.cc b/src/lib/asiodns/io_fetch.cc
index 73d8a4b..eed5fdf 100644
--- a/src/lib/asiodns/io_fetch.cc
+++ b/src/lib/asiodns/io_fetch.cc
@@ -14,11 +14,10 @@
 
 #include <config.h>
 
-#include <sys/types.h>
+#include <unistd.h>             // for some IPC/network system calls
 #include <netinet/in.h>
 #include <stdint.h>
 #include <sys/socket.h>
-#include <unistd.h>             // for some IPC/network system calls
 
 #include <boost/bind.hpp>
 #include <boost/scoped_ptr.hpp>
diff --git a/src/lib/asiodns/tcp_server.cc b/src/lib/asiodns/tcp_server.cc
index 5a06857..3e97e14 100644
--- a/src/lib/asiodns/tcp_server.cc
+++ b/src/lib/asiodns/tcp_server.cc
@@ -14,10 +14,9 @@
 
 #include <config.h>
 
-#include <sys/types.h>
+#include <unistd.h>             // for some IPC/network system calls
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <unistd.h>             // for some IPC/network system calls
 #include <errno.h>
 
 #include <boost/shared_array.hpp>
diff --git a/src/lib/asiodns/udp_server.cc b/src/lib/asiodns/udp_server.cc
index 0a8649a..0fb8bec 100644
--- a/src/lib/asiodns/udp_server.cc
+++ b/src/lib/asiodns/udp_server.cc
@@ -12,10 +12,9 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <sys/types.h>
+#include <unistd.h>             // for some IPC/network system calls
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <unistd.h>             // for some IPC/network system calls
 #include <errno.h>
 
 #include <boost/shared_array.hpp>
diff --git a/src/lib/asiolink/io_service.cc b/src/lib/asiolink/io_service.cc
index 124a301..15fad0c 100644
--- a/src/lib/asiolink/io_service.cc
+++ b/src/lib/asiolink/io_service.cc
@@ -14,10 +14,9 @@
 
 #include <config.h>
 
-#include <sys/types.h>
+#include <unistd.h>             // for some IPC/network system calls
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include <unistd.h>             // for some IPC/network system calls
 
 #include <asio.hpp>
 #include <asiolink/io_service.h>
diff --git a/src/lib/resolve/recursive_query.cc b/src/lib/resolve/recursive_query.cc
index f7bb441..12b7c3b 100644
--- a/src/lib/resolve/recursive_query.cc
+++ b/src/lib/resolve/recursive_query.cc
@@ -14,9 +14,8 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <netinet/in.h>
 #include <stdlib.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #include <unistd.h>             // for some IPC/network system calls
 #include <string>