BIND 10 trac1593-sun, updated. 0e8c2c9e572204db1b0586d6da94891168fd3a48 [1593-sun] Fix errors on Sun build

BIND 10 source code commits bind10-changes at lists.isc.org
Mon Feb 20 17:56:18 UTC 2012


The branch, trac1593-sun has been updated
       via  0e8c2c9e572204db1b0586d6da94891168fd3a48 (commit)
      from  aacfc3fee9cbf5a2b7945c165cace1af81877f5f (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 0e8c2c9e572204db1b0586d6da94891168fd3a48
Author: Stephen Morris <stephen at isc.org>
Date:   Mon Feb 20 17:55:12 2012 +0000

    [1593-sun] Fix errors on Sun build
    
    Sunstudio could not find memset() in cstring; changed the include to
    that of "string.h".  Also it complained of an anachronism in using
    "extern int close()" as a default argument.  Removed these.

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

Summary of changes:
 src/bin/sockcreator/main.cc        |    2 +-
 src/bin/sockcreator/sockcreator.cc |    6 +++---
 src/bin/sockcreator/sockcreator.h  |    6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/sockcreator/main.cc b/src/bin/sockcreator/main.cc
index 3e06882..17efd04 100644
--- a/src/bin/sockcreator/main.cc
+++ b/src/bin/sockcreator/main.cc
@@ -24,7 +24,7 @@ main() {
      * but ability to bind ports? It would be nice.
      */
     try {
-        run(STDIN_FILENO, STDOUT_FILENO);
+        run(STDIN_FILENO, STDOUT_FILENO, getSock, isc::util::io::send_fd, close);
     } catch (const SocketCreatorError& ec) {
         return (ec.getExitCode());
     }
diff --git a/src/bin/sockcreator/sockcreator.cc b/src/bin/sockcreator/sockcreator.cc
index 0b1e763..d7fe1f8 100644
--- a/src/bin/sockcreator/sockcreator.cc
+++ b/src/bin/sockcreator/sockcreator.cc
@@ -18,7 +18,7 @@
 #include <util/io/sockaddr_util.h>
 
 #include <cerrno>
-#include <cstring>
+#include <string.h>
 
 #include <unistd.h>
 #include <sys/types.h>
@@ -216,8 +216,8 @@ getSock(const int type, struct sockaddr* bind_addr, const socklen_t addr_len) {
 
 // Main run loop.
 void
-run(const int input_fd, const int output_fd, const get_sock_t get_sock,
-    const send_fd_t send_fd_fun, const close_t close_fun)
+run(const int input_fd, const int output_fd, get_sock_t get_sock,
+    send_fd_t send_fd_fun, close_t close_fun)
 {
     for (;;) {
         char command;
diff --git a/src/bin/sockcreator/sockcreator.h b/src/bin/sockcreator/sockcreator.h
index df2bf8f..012d8c3 100644
--- a/src/bin/sockcreator/sockcreator.h
+++ b/src/bin/sockcreator/sockcreator.h
@@ -135,10 +135,8 @@ typedef int (*close_t)(int);
 /// \exception isc::socket_creator::ProtocolError Unrecognised command received
 /// \exception isc::socket_creator::InternalError Other error
 void
-run(const int input_fd, const int output_fd,
-    const get_sock_t get_sock_fun = getSock,
-    const send_fd_t send_fd_fun = isc::util::io::send_fd,
-    const close_t close_fun = close);
+run(const int input_fd, const int output_fd, get_sock_t get_sock_fun,
+    send_fd_t send_fd_fun, close_t close_fun);
 
 }   // namespace socket_creator
 }   // NAMESPACE ISC



More information about the bind10-changes mailing list