.gitignore | 4 ++++
ldap/servers/plugins/replication/repl_extop.c | 10 ++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 1f775d7339cdabde70e73ce0be2e4432b16ba1a3
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Fri Sep 14 13:57:22 2012 -0600
fix compiler warnings in ticket 374 code
diff --git a/ldap/servers/plugins/replication/repl_extop.c
b/ldap/servers/plugins/replication/repl_extop.c
index ca8fc55..645e749 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -46,7 +46,10 @@
#include "repl5.h"
#include "repl5_prot_private.h"
#include "cl5_api.h"
-
+#define ENABLE_TEST_TICKET_374
+#ifdef ENABLE_TEST_TICKET_374
+#include <unistd.h> /* for usleep */
+#endif
/*
* repl_extop.c - there are two types of functions in this file:
@@ -902,13 +905,12 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
}
/* remove this code once ticket 374 is fixed */
-#define ENABLE_TEST_TICKET_374
#ifdef ENABLE_TEST_TICKET_374
if (getenv("SLAPD_TEST_TICKET_374") && (opid > 20)) {
int i = 0;
int max = 480 * 5;
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
- "conn=%d op=%d repl=\"%s\": "
+ "conn=%" NSPRIu64 " op=%d repl=\"%s\": "
"374 - Starting sleep: connext->repl_protocol_version == %d\n",
connid, opid, repl_root, connext->repl_protocol_version);
@@ -917,7 +919,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
}
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
- "conn=%d op=%d repl=\"%s\": "
+ "conn=%" NSPRIu64 " op=%d repl=\"%s\": "
"374 - Finished sleep: connext->repl_protocol_version == %d\n",
connid, opid, repl_root, connext->repl_protocol_version);
}
commit f7cd60c0f54fcef0723fd6785aa7e808dedbb365
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Sep 6 14:36:29 2012 -0600
add eclipse generated files to the ignore list
diff --git a/.gitignore b/.gitignore
index c1ba6bd..ea1af3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
autom4te.cache
*~
*.patch
+.autotools
+.cproject
+.project
+.settings
Show replies by thread