Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master

15 files changed, 16 insertions, 14 deletions

diff --git a/src/clib/bsearch.c b/src/clib/bsearch.c
index 3e55009a..de15358b 100644
--- a/src/clib/bsearch.c
+++ b/src/clib/bsearch.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2010, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2010, 2015 Oracle and/or its affiliates.  All rights reserved.
  *
  * $Id$
  */
diff --git a/src/clib/getcwd.c b/src/clib/getcwd.c
index 83e8b62d..028fc3f2 100644
--- a/src/clib/getcwd.c
+++ b/src/clib/getcwd.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 1996, 2015 Oracle and/or its affiliates.  All rights reserved.
  */
 /*
  * Copyright (c) 1989, 1991, 1993
diff --git a/src/clib/getopt.c b/src/clib/getopt.c
index ca98e7f1..4e4dc6c8 100644
--- a/src/clib/getopt.c
+++ b/src/clib/getopt.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 1996, 2015 Oracle and/or its affiliates.  All rights reserved.
  */
 /*
  * Copyright (c) 1987, 1993, 1994
diff --git a/src/clib/isalpha.c b/src/clib/isalpha.c
index 6bf1ffb7..39114c08 100644
--- a/src/clib/isalpha.c
+++ b/src/clib/isalpha.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2005, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2005, 2015 Oracle and/or its affiliates.  All rights reserved.
  *
  * $Id$
  */
diff --git a/src/clib/isdigit.c b/src/clib/isdigit.c
index d1b2a65e..e4e1d3d8 100644
--- a/src/clib/isdigit.c
+++ b/src/clib/isdigit.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2005, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2005, 2015 Oracle and/or its affiliates.  All rights reserved.
  *
  * $Id$
  */
diff --git a/src/clib/isprint.c b/src/clib/isprint.c
index 685e20ea..310894d5 100644
--- a/src/clib/isprint.c
+++ b/src/clib/isprint.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2005, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2005, 2015 Oracle and/or its affiliates.  All rights reserved.
  *
  * $Id$
  */
diff --git a/src/clib/isspace.c b/src/clib/isspace.c
index df450d3b..48a20617 100644
--- a/src/clib/isspace.c
+++ b/src/clib/isspace.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2005, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2005, 2015 Oracle and/or its affiliates.  All rights reserved.
  *
  * $Id$
  */
diff --git a/src/clib/memcmp.c b/src/clib/memcmp.c
index 7fec827c..7db1d3ad 100644
--- a/src/clib/memcmp.c
+++ b/src/clib/memcmp.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 1996, 2015 Oracle and/or its affiliates.  All rights reserved.
  */
 /*
  * Copyright (c) 1990, 1993
diff --git a/src/clib/memmove.c b/src/clib/memmove.c
index 34a181cc..866843dc 100644
--- a/src/clib/memmove.c
+++ b/src/clib/memmove.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 1996, 2015 Oracle and/or its affiliates.  All rights reserved.
  */
 /*
  * Copyright (c) 1990, 1993
diff --git a/src/clib/printf.c b/src/clib/printf.c
index a2c01296..f36eeb15 100644
--- a/src/clib/printf.c
+++ b/src/clib/printf.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2005, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2005, 2015 Oracle and/or its affiliates.  All rights reserved.
  *
  * $Id$
  */
diff --git a/src/clib/raise.c b/src/clib/raise.c
index ad0e567f..223f797f 100644
--- a/src/clib/raise.c
+++ b/src/clib/raise.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1997, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 1997, 2015 Oracle and/or its affiliates.  All rights reserved.
  *
  * $Id$
  */
diff --git a/src/clib/rand.c b/src/clib/rand.c
index 6b810060..426627a9 100644
--- a/src/clib/rand.c
+++ b/src/clib/rand.c
@@ -13,6 +13,7 @@
  * PUBLIC: void srand __P((unsigned int));
  * PUBLIC: #endif
  */
+#ifndef HAVE_RAND
 int rand(void)	/* RAND_MAX assumed to be 32767 */
 {
 	DB_GLOBAL(rand_next) = DB_GLOBAL(rand_next) * 1103515245 + 12345;
@@ -23,3 +24,4 @@ void srand(unsigned int seed)
 {
 	DB_GLOBAL(rand_next) = seed;
 }
+#endif
diff --git a/src/clib/snprintf.c b/src/clib/snprintf.c
index 6b31d850..8f1a6855 100644
--- a/src/clib/snprintf.c
+++ b/src/clib/snprintf.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 1996, 2015 Oracle and/or its affiliates.  All rights reserved.
  *
  * $Id$
  */
diff --git a/src/clib/strerror.c b/src/clib/strerror.c
index 62bd7dd5..b2d148e4 100644
--- a/src/clib/strerror.c
+++ b/src/clib/strerror.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1997, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 1997, 2015 Oracle and/or its affiliates.  All rights reserved.
  */
 /*
  * Copyright (c) 1988, 1993
diff --git a/src/clib/time.c b/src/clib/time.c
index abc2ab2d..3a3f0c3e 100644
--- a/src/clib/time.c
+++ b/src/clib/time.c
@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2006, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2006, 2015 Oracle and/or its affiliates.  All rights reserved.
  *
  * $Id$
  */