Merge pull request #285 from orgads/mingw
Fix compilation with MinGW
diff --git a/usrsctplib/netinet/sctp_os_userspace.h b/usrsctplib/netinet/sctp_os_userspace.h
index 9b1cf44..9b1e567 100755
--- a/usrsctplib/netinet/sctp_os_userspace.h
+++ b/usrsctplib/netinet/sctp_os_userspace.h
@@ -80,7 +80,7 @@
#define IPVERSION 4
#define MAXTTL 255
/* VS2010 comes with stdint.h */
-#if _MSC_VER >= 1600
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
#include <stdint.h>
#else
#define uint64_t unsigned __int64
@@ -220,7 +220,7 @@
#define bzero(buf, len) memset(buf, 0, len)
#define bcopy(srcKey, dstKey, len) memcpy(dstKey, srcKey, len)
-#if _MSC_VER < 1900
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define snprintf(data, size, format, ...) _snprintf_s(data, size, _TRUNCATE, format, __VA_ARGS__)
#endif
#define inline __inline
diff --git a/usrsctplib/user_environment.h b/usrsctplib/user_environment.h
index c11ad2c..63ccdbf 100755
--- a/usrsctplib/user_environment.h
+++ b/usrsctplib/user_environment.h
@@ -62,7 +62,7 @@
*/
extern int nmbclusters;
-#if !defined (__Userspace_os_Windows)
+#if !defined(_MSC_VER)
#define min(a,b) ((a)>(b)?(b):(a))
#define max(a,b) ((a)>(b)?(a):(b))
#endif
