4 files changed, 7 insertions, 7 deletions
diff --git a/src/jtag/aice/aice_pipe.c b/src/jtag/aice/aice_pipe.c
index 64f126dd..18ad40ea 100644
--- a/src/jtag/aice/aice_pipe.c
+++ b/src/jtag/aice/aice_pipe.c
@@ -174,7 +174,7 @@ static int aice_pipe_write(const void *buffer, int count)
 static int aice_pipe_read(void *buffer, int count)
 {
 	int n;
-	long long then, cur;
+	int64_t then, cur;
 
 	then = timeval_ms();
 
diff --git a/src/jtag/aice/aice_usb.c b/src/jtag/aice/aice_usb.c
index f5b99532..b27f7200 100644
--- a/src/jtag/aice/aice_usb.c
+++ b/src/jtag/aice/aice_usb.c
@@ -1856,7 +1856,7 @@ static int aice_check_dbger(uint32_t coreid, uint32_t expect_status)
 		if ((i % 30) == 0)
 			keep_alive();
 
-		long long then = 0;
+		int64_t then = 0;
 		if (i == aice_count_to_check_dbger)
 			then = timeval_ms();
 		if (i >= aice_count_to_check_dbger) {
@@ -2997,7 +2997,7 @@ static int aice_usb_step(uint32_t coreid)
 		if (AICE_TARGET_HALTED == state)
 			break;
 
-		long long then = 0;
+		int64_t then = 0;
 		if (i == 30)
 			then = timeval_ms();
 
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index e4d63296..bc6bbf20 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -1247,7 +1247,7 @@ COMMAND_HANDLER(handle_wait_srst_deassert)
 
 	LOG_USER("Waiting for srst assert + deassert for at most %dms", timeout_ms);
 	int asserted_yet;
-	long long then = timeval_ms();
+	int64_t then = timeval_ms();
 	while (jtag_srst_asserted(&asserted_yet) == ERROR_OK) {
 		if ((timeval_ms() - then) > timeout_ms) {
 			LOG_ERROR("Timed out");
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 271a2817..67d99070 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -145,8 +145,8 @@ static int zy1000_power_dropout(int *dropout)
 static void waitSRST(bool asserted)
 {
 	bool first = true;
-	long long start = 0;
-	long total = 0;
+	int64_t start = 0;
+	int64_t total = 0;
 	const char *mode = asserted ? "assert" : "deassert";
 
 	for (;; ) {
@@ -167,7 +167,7 @@ static void waitSRST(bool asserted)
 		keep_alive();
 
 		if (total > 5000) {
-			LOG_ERROR("SRST took too long to %s: %dms", mode, (int)total);
+			LOG_ERROR("SRST took too long to %s: %" PRId64 "ms", mode, total);
 			break;
 		}
 	}