Merge pull request #27 from egtra/msvc2015

Fix to compile with Visual C++ 2015
seanmiddleditch · Aug 21, 2017 · 2b645e9 · 2b645e9
2 parents 9b31ab2 + 66013f7
commit 2b645e9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/libtelnet.h b/libtelnet.h
@@ -60,6 +60,9 @@ extern "C" {
 # define TELNET_GNU_SENTINEL /*!< internal helper */
 #endif
 
+/* Disable environ macro for Visual C++ 2015. */
+#undef environ
+
 /*! Telnet state tracker object type. */
 typedef struct telnet_t telnet_t;
 

diff --git a/util/telnet-chatd.c b/util/telnet-chatd.c
@@ -27,7 +27,10 @@
 #	include <winsock2.h>
 #	include <ws2tcpip.h>
 
+#ifndef _UCRT
 #	define snprintf _snprintf
+#endif
+
 #	define poll WSAPoll
 #	define close closesocket
 #	define strdup _strdup

diff --git a/util/telnet-client.c b/util/telnet-client.c
@@ -100,7 +100,9 @@ static void _event_handler(telnet_t *telnet, telnet_event_t *ev,
 	switch (ev->type) {
 	/* data received */
 	case TELNET_EV_DATA:
-		printf("%.*s", (int)ev->data.size, ev->data.buffer);
+		if (ev->data.size && fwrite(ev->data.buffer, 1, ev->data.size, stdout) != ev->data.size) {
+              		fprintf(stderr, "ERROR: Could not write complete buffer to stdout");
+		}
 		fflush(stdout);
 		break;
 	/* data must be sent */

diff --git a/util/telnet-proxy.c b/util/telnet-proxy.c
@@ -27,14 +27,16 @@
 #	include <winsock2.h>
 #	include <ws2tcpip.h>
 
+#ifndef _UCRT
 #	define snprintf _snprintf
+#endif
+
 #	define poll WSAPoll
 #	define close closesocket
-
-#if !defined(_MSC_VER) || _MSC_VER < 1600 // VC 9 and prior do not define this macro
+#	undef gai_strerror
+#	define gai_strerror gai_strerrorA
 #	define ECONNRESET WSAECONNRESET
 #endif
-#endif
 
 #include <errno.h>
 #include <stdio.h>