Enable better build-time flexibility over which WinSock to include

[u/mdw/putty] / scp.c

diff --git a/scp.c b/scp.c
index 1160139..8c7df21 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -9,7 +9,13 @@
  */
 
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
 #include <winsock.h>
+#endif
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -68,12 +74,14 @@ static void send_str_msg(unsigned int msg_id, char *str);
 static void gui_update_stats(char *name, unsigned long size, int percentage, time_t elapsed);
 
 /*
- *  This function is needed to link with ssh.c, but it never gets called.
+ * These functions are needed to link with ssh.c, but never get called.
  */
 void term_out(void)
 {
     abort();
 }
+void begin_session(void) {
+}
 
 /* GUI Adaptation - Sept 2000 */
 void send_msg(HWND h, UINT message, WPARAM wParam)
@@ -157,6 +165,19 @@ void fatalbox(char *fmt, ...)
 
     exit(1);
 }
+void connection_fatal(char *fmt, ...)
+{
+    char str[0x100]; /* Make the size big enough */
+    va_list ap;
+    va_start(ap, fmt);
+    strcpy(str, "Fatal:");
+    vsprintf(str+strlen(str), fmt, ap);
+    va_end(ap);
+    strcat(str, "\n");
+    tell_str(stderr, str);
+
+    exit(1);
+}
 
 /*
  *  Print an error message and exit after closing the SSH link.