Merge pull request #296 from weinrank/windows-ssize
Windows ssize_t fix
diff --git a/programs/tsctp_upcall.c b/programs/tsctp_upcall.c
index c29cef3..48061a8 100644
--- a/programs/tsctp_upcall.c
+++ b/programs/tsctp_upcall.c
@@ -242,11 +242,7 @@
} else {
if (par_very_verbose) {
if (infotype == SCTP_RECVV_RCVINFO) {
-#ifdef _WIN32
- printf("Message received - %" PRIu64 " bytes - %s - sid %u - tsn %u %s\n",
-#else
- printf("Message received - %zd bytes - %s - sid %u - tsn %u %s\n",
-#endif
+ printf("Message received - %zd bytes - %s - sid %u - tsn %u %s\n",
n,
(rcvinfo->rcv_flags & SCTP_UNORDERED) ? "unordered" : "ordered",
rcvinfo->rcv_sid,
@@ -255,11 +251,7 @@
);
} else {
-#ifdef _WIN32
- printf("Message received - %" PRIu64 " bytes %s\n", n, (recv_flags & MSG_EOR) ? "- EOR" : "");
-#else
printf("Message received - %zd bytes %s\n", n, (recv_flags & MSG_EOR) ? "- EOR" : "");
-#endif
}
}
tsctp_meta->stat_fragment_sum += n;
diff --git a/usrsctplib/usrsctp.h b/usrsctplib/usrsctp.h
index 12c6571..25d087d 100644
--- a/usrsctplib/usrsctp.h
+++ b/usrsctplib/usrsctp.h
@@ -72,7 +72,16 @@
#define int32_t __int32
#endif
-#define ssize_t __int64
+#ifndef ssize_t
+#ifdef _WIN64
+#define ssize_t __int64
+#elif defined _WIN32
+#define ssize_t int
+#else
+#error "Unknown platform!"
+#endif
+#endif
+
#define MSG_EOR 0x8
#ifndef EWOULDBLOCK
#define EWOULDBLOCK WSAEWOULDBLOCK
