Merge branch 'develop' into wt2140

3 files changed, 28 insertions, 37 deletions

diff --git a/test/format/format.h b/test/format/format.h
index d82dea5451f..76e8bc5e43c 100644
--- a/test/format/format.h
+++ b/test/format/format.h
@@ -62,8 +62,6 @@
 #define	WT_GCC_ATTRIBUTE(x)
 #endif
 
-extern WT_EXTENSION_API *wt_api;
-
 #define	EXTPATH	"../../ext/"			/* Extensions path */
 
 #define	BZIP_PATH							\
@@ -94,8 +92,6 @@ extern WT_EXTENSION_API *wt_api;
 #define	KILOBYTE(v)	((v) * 1024)
 #undef	MEGABYTE
 #define	MEGABYTE(v)	((v) * 1048576)
-#undef	GIGABYTE
-#define	GIGABYTE(v)	((v) * 1073741824ULL)
 
 #define	WT_NAME	"wt"				/* Object name */
 
@@ -311,7 +307,6 @@ void	 config_print(int);
 void	 config_setup(void);
 void	 config_single(const char *, int);
 void	*dmalloc(size_t);
-char	*dstrdup(const char *);
 void	 fclose_and_clear(FILE **);
 void	 key_gen(uint8_t *, size_t *, uint64_t);
 void	 key_gen_insert(WT_RAND_STATE *, uint8_t *, size_t *, uint64_t);
diff --git a/test/format/util.c b/test/format/util.c
index 0f4f5de7c20..88a41f2eef1 100644
--- a/test/format/util.c
+++ b/test/format/util.c
@@ -32,6 +32,34 @@
 #define	MAX(a, b)	(((a) > (b)) ? (a) : (b))
 #endif
 
+/*
+ * dmalloc --
+ *	Call malloc, dying on failure.
+ */
+void *
+dmalloc(size_t len)
+{
+	void *p;
+
+	if ((p = malloc(len)) == NULL)
+		die(errno, "malloc");
+	return (p);
+}
+
+/*
+ * dstrdup --
+ *	Call strdup, dying on failure.
+ */
+static char *
+dstrdup(const char *str)
+{
+	char *p;
+
+	if ((p = strdup(str)) == NULL)
+		die(errno, "strdup");
+	return (p);
+}
+
 static inline uint32_t
 kv_len(WT_RAND_STATE *rnd, uint64_t keyno, uint32_t min, uint32_t max)
 {
@@ -410,31 +438,3 @@ fclose_and_clear(FILE **fpp)
 		die(errno, "fclose");
 	return;
 }
-
-/*
- * dmalloc --
- *	Call malloc, dying on failure.
- */
-void *
-dmalloc(size_t len)
-{
-	void *p;
-
-	if ((p = malloc(len)) == NULL)
-		die(errno, "malloc");
-	return (p);
-}
-
-/*
- * dstrdup --
- *	Call strdup, dying on failure.
- */
-char *
-dstrdup(const char *str)
-{
-	char *p;
-
-	if ((p = strdup(str)) == NULL)
-		die(errno, "strdup");
-	return (p);
-}
diff --git a/test/utility/test_util.i b/test/utility/test_util.i
index 48b5d191a32..00948e1f74a 100644
--- a/test/utility/test_util.i
+++ b/test/utility/test_util.i
@@ -25,10 +25,6 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <wiredtiger.h>
 #include "wt_internal.h"			/* For __wt_XXX */
 
 #ifdef _WIN32