For now, just rename the WiredTiger function __wt_cursor_equals to be

__wt_cursor_equal. We'll do a better fix to avoid the problem in the
future, when we have a few minutes.

7 files changed, 8 insertions, 8 deletions

diff --git a/src/cursor/cur_ds.c b/src/cursor/cur_ds.c
index c58d6899150..cc3e23570d5 100644
--- a/src/cursor/cur_ds.c
+++ b/src/cursor/cur_ds.c
@@ -454,7 +454,7 @@ __wt_curds_open(
 	    __wt_cursor_set_key,	/* set-key */
 	    __wt_cursor_set_value,	/* set-value */
 	    __curds_compare,		/* compare */
-	    __wt_cursor_equals,		/* equals */
+	    __wt_cursor_equal,		/* equals */
 	    __curds_next,		/* next */
 	    __curds_prev,		/* prev */
 	    __curds_reset,		/* reset */
diff --git a/src/cursor/cur_log.c b/src/cursor/cur_log.c
index 5de3762217f..2e2a2530df6 100644
--- a/src/cursor/cur_log.c
+++ b/src/cursor/cur_log.c
@@ -344,7 +344,7 @@ __wt_curlog_open(WT_SESSION_IMPL *session,
 	    __wt_cursor_set_key,	/* set-key */
 	    __wt_cursor_set_value,	/* set-value */
 	    __curlog_compare,		/* compare */
-	    __wt_cursor_equals,		/* equals */
+	    __wt_cursor_equal,		/* equals */
 	    __curlog_next,		/* next */
 	    __wt_cursor_notsup,		/* prev */
 	    __curlog_reset,		/* reset */
diff --git a/src/cursor/cur_metadata.c b/src/cursor/cur_metadata.c
index 9860eb65a55..31c96e3087a 100644
--- a/src/cursor/cur_metadata.c
+++ b/src/cursor/cur_metadata.c
@@ -409,7 +409,7 @@ __wt_curmetadata_open(WT_SESSION_IMPL *session,
 	    __wt_cursor_set_key,	/* set-key */
 	    __wt_cursor_set_value,	/* set-value */
 	    __curmetadata_compare,	/* compare */
-	    __wt_cursor_equals,		/* equals */
+	    __wt_cursor_equal,		/* equals */
 	    __curmetadata_next,		/* next */
 	    __curmetadata_prev,		/* prev */
 	    __curmetadata_reset,	/* reset */
diff --git a/src/cursor/cur_std.c b/src/cursor/cur_std.c
index 858c6af6853..df38eb9e57d 100644
--- a/src/cursor/cur_std.c
+++ b/src/cursor/cur_std.c
@@ -480,11 +480,11 @@ __wt_cursor_close(WT_CURSOR *cursor)
 }
 
 /*
- * __wt_cursor_equals --
+ * __wt_cursor_equal --
  *	WT_CURSOR->equals default implementation.
  */
 int
-__wt_cursor_equals(WT_CURSOR *cursor, WT_CURSOR *other, int *equalp)
+__wt_cursor_equal(WT_CURSOR *cursor, WT_CURSOR *other, int *equalp)
 {
 	WT_DECL_RET;
 	WT_SESSION_IMPL *session;
diff --git a/src/cursor/cur_table.c b/src/cursor/cur_table.c
index 494277bb2f1..5d3f0641ed8 100644
--- a/src/cursor/cur_table.c
+++ b/src/cursor/cur_table.c
@@ -839,7 +839,7 @@ __wt_curtable_open(WT_SESSION_IMPL *session,
 	    __wt_curtable_set_key,	/* set-key */
 	    __wt_curtable_set_value,	/* set-value */
 	    __curtable_compare,		/* compare */
-	    __wt_cursor_equals,		/* equals */
+	    __wt_cursor_equal,		/* equals */
 	    __curtable_next,		/* next */
 	    __curtable_prev,		/* prev */
 	    __curtable_reset,		/* reset */
diff --git a/src/include/extern.h b/src/include/extern.h
index 4872e48eeed..35b8dfc113e 100644
--- a/src/include/extern.h
+++ b/src/include/extern.h
@@ -280,7 +280,7 @@ extern int __wt_cursor_get_valuev(WT_CURSOR *cursor, va_list ap);
 extern void __wt_cursor_set_value(WT_CURSOR *cursor, ...);
 extern void __wt_cursor_set_valuev(WT_CURSOR *cursor, va_list ap);
 extern int __wt_cursor_close(WT_CURSOR *cursor);
-extern int __wt_cursor_equals(WT_CURSOR *cursor, WT_CURSOR *other, int *equalp);
+extern int __wt_cursor_equal(WT_CURSOR *cursor, WT_CURSOR *other, int *equalp);
 extern int __wt_cursor_reconfigure(WT_CURSOR *cursor, const char *config);
 extern int __wt_cursor_dup_position(WT_CURSOR *to_dup, WT_CURSOR *cursor);
 extern int __wt_cursor_init(WT_CURSOR *cursor, const char *uri, WT_CURSOR *owner, const char *cfg[], WT_CURSOR **cursorp);
diff --git a/src/lsm/lsm_cursor.c b/src/lsm/lsm_cursor.c
index bf5ae465664..39b4b4508b7 100644
--- a/src/lsm/lsm_cursor.c
+++ b/src/lsm/lsm_cursor.c
@@ -1429,7 +1429,7 @@ __wt_clsm_open(WT_SESSION_IMPL *session,
 	    __wt_cursor_set_key,	/* set-key */
 	    __wt_cursor_set_value,	/* set-value */
 	    __clsm_compare,		/* compare */
-	    __wt_cursor_equals,		/* equals */
+	    __wt_cursor_equal,		/* equals */
 	    __clsm_next,		/* next */
 	    __clsm_prev,		/* prev */
 	    __clsm_reset,		/* reset */