fix confict

89fdbc82 · chenhaowen · 3d810c0a · 89fdbc82
Commit 89fdbc82 authored Dec 08, 2016 by chenhaowen
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

src/auth.c src/auth.c +2 -1

No files found.
--- a/src/auth.c
+++ b/src/auth.c
@@ -585,6 +585,7 @@ void gen_ka2_checksum(uint8_t *data, int len, uint8_t *checksum)
 }

 static void short_wait_sleep(int second){
-    for(int i = second; i > 0 && !drcom_config.exit; i--)
+    int i;
+    for(i = second; i > 0 && !drcom_config.exit; i--)
        sleep(1);
 }