summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/smbldap.c4
-rw-r--r--source3/lib/util.c2
-rw-r--r--source3/lib/util_sock.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index e122acd188..77356150bc 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -890,7 +890,7 @@ int smbldap_retry_open(struct smbldap_state *ldap_state, int *attempts)
*/
DEBUG(3, ("Sleeping for %u milliseconds before reconnecting\n",
sleep_time));
- msleep(sleep_time);
+ smb_msleep(sleep_time);
}
(*attempts)++;
@@ -937,7 +937,7 @@ int smbldap_search(struct smbldap_state *ldap_state,
if (sleep_time > 0) {
/* we wait for the LDAP replication */
DEBUG(5,("smbldap_search: waiting %d milliseconds for LDAP replication.\n",sleep_time));
- msleep(sleep_time);
+ smb_msleep(sleep_time);
DEBUG(5,("smbldap_search: go on!\n"));
ZERO_STRUCT(ldap_state->last_rebind);
}
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 61dbc2cb2a..f169a3103e 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -769,7 +769,7 @@ SMB_OFF_T transfer_file(int infd,int outfd,SMB_OFF_T n)
Sleep for a specified number of milliseconds.
********************************************************************/
-void msleep(unsigned int t)
+void smb_msleep(unsigned int t)
{
unsigned int tdiff=0;
struct timeval tval,t1,t2;
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 782f5f3f73..a275ddabb9 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -740,7 +740,7 @@ int open_socket_out(int type, struct in_addr *addr, int port ,int timeout)
/* Some systems return EAGAIN when they mean EINPROGRESS */
if (ret < 0 && (errno == EINPROGRESS || errno == EALREADY ||
errno == EAGAIN) && (connect_loop < timeout) ) {
- msleep(connect_loop);
+ smb_msleep(connect_loop);
connect_loop += increment;
if (increment < 250) {
/* After 8 rounds we end up at a max of 255 msec */