BIND 10 master, updated. 2858ffa9471778539dabf7cbf5204296d464351d Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  2858ffa9471778539dabf7cbf5204296d464351d (commit)
       via  2d357b48add9d446e96488a48135aec7a12eb0a0 (commit)
      from  6030d51fe670fb00e6831263be61a7cc4fe97f1b (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 2858ffa9471778539dabf7cbf5204296d464351d
Merge: 2d357b4 6030d51
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Dec 21 23:47:04 2011 +0000

    Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 2d357b48add9d446e96488a48135aec7a12eb0a0
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Dec 21 23:46:20 2011 +0000

    [master] workaround for sunstudio build failure (it complained about memcpy
    if we (correctly) included cstring)

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

Summary of changes:
 src/lib/util/io/fd_share.cc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/io/fd_share.cc b/src/lib/util/io/fd_share.cc
index b330b00..d5f2c5d 100644
--- a/src/lib/util/io/fd_share.cc
+++ b/src/lib/util/io/fd_share.cc
@@ -12,7 +12,9 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <cstring>
+// XXX: SunStudio compiler would complain about memcpy if we used cstring,
+// so we intentionally include the .h version here.
+#include <string.h>
 #include <cstdlib>
 
 #include <sys/types.h>