diff options
| author | Björn Jacke <bj@sernet.de> | 2010-09-16 21:36:37 +0200 |
|---|---|---|
| committer | Björn Jacke <bj@sernet.de> | 2010-09-16 21:38:20 +0200 |
| commit | 2b254c814b139f93997f61525d77b934596c53a3 (patch) | |
| tree | 945897a1c52a9d6d8f5958f47b6c8b4a877d7164 /source4/torture/nbt | |
| parent | 0fd16018a1c993166eae72390433398347538a81 (diff) | |
| download | samba-2b254c814b139f93997f61525d77b934596c53a3.tar.gz | |
s3/s4: merge msleep and smb_msleep
the merged variant is renamed to smb_msleep as some platforms already have a
msleep function.
Diffstat (limited to 'source4/torture/nbt')
| -rw-r--r-- | source4/torture/nbt/winsreplication.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c index a0d4c23ae7e..caa2d33ede3 100644 --- a/source4/torture/nbt/winsreplication.c +++ b/source4/torture/nbt/winsreplication.c @@ -9599,7 +9599,7 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_ while (nbtsock->send_queue) { event_loop_once(nbtsock->event_ctx); } - msleep(1000); + smb_msleep(1000); rec->defend.timeout = 0; rec->defend.ret = true; @@ -9656,7 +9656,7 @@ static void test_conflict_owned_active_vs_replica_handler_release( while (nbtsock->send_queue) { event_loop_once(nbtsock->event_ctx); } - msleep(1000); + smb_msleep(1000); rec->defend.timeout = 0; rec->defend.ret = true; |