nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Enable better build-time flexibility over which WinSock to include

Browse Source 
[originally from svn r615]
This commit is contained in:
Simon Tatham 2000-09-22 13:16:49 +00:00
parent c0ac8ab9b4
commit e70425dda6
8 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -21,6 +21,15 @@
# - COMPAT=/DWIN32S_COMPAT # - COMPAT=/DWIN32S_COMPAT
# Generates a binary that works (minimally) with Win32s. # Generates a binary that works (minimally) with Win32s.
# #
# - COMPAT=/DAUTO_WINSOCK
# Causes PuTTY to assume that <windows.h> includes its own WinSock
# header file, so that it won't try to include <winsock.h>.
#
# - COMPAT=/DWINSOCK_TWO
# Causes the PuTTY utilities to include <winsock2.h> instead of
# <winsock.h>, except Plink which _needs_ WinSock 2 so it already
# does this.
#
# - RCFL=/DASCIICTLS # - RCFL=/DASCIICTLS
# Uses ASCII rather than Unicode to specify the tab control in # Uses ASCII rather than Unicode to specify the tab control in
# the resource file. Probably most useful when compiling with # the resource file. Probably most useful when compiling with

2
plink.c
View File

@ -2,7 +2,9 @@
* PLink - a command-line (stdin/stdout) variant of PuTTY. * PLink - a command-line (stdin/stdout) variant of PuTTY.
*/ */
#ifndef AUTO_WINSOCK
#include <winsock2.h> #include <winsock2.h>
#endif
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>

6
raw.c
View File

@ -1,7 +1,13 @@
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef AUTO_WINSOCK
#ifdef WINSOCK_TWO
#include <winsock2.h>
#else
#include <winsock.h> #include <winsock.h>
#endif
#endif
#include "putty.h" #include "putty.h"

6
scp.c
View File

@ -9,7 +9,13 @@
*/ */
#include <windows.h> #include <windows.h>
#ifndef AUTO_WINSOCK
#ifdef WINSOCK_TWO
#include <winsock2.h>
#else
#include <winsock.h> #include <winsock.h>
#endif
#endif
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

6
ssh.c
View File

@ -2,7 +2,13 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <assert.h> #include <assert.h>
#ifndef AUTO_WINSOCK
#ifdef WINSOCK_TWO
#include <winsock2.h>
#else
#include <winsock.h> #include <winsock.h>
#endif
#endif
#include "putty.h" #include "putty.h"
#include "tree234.h" #include "tree234.h"

6
telnet.c
View File

@ -1,7 +1,13 @@
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef AUTO_WINSOCK
#ifdef WINSOCK_TWO
#include <winsock2.h>
#else
#include <winsock.h> #include <winsock.h>
#endif
#endif
#include "putty.h" #include "putty.h"

6
windlg.c
View File

@ -1,7 +1,13 @@
#include <windows.h> #include <windows.h>
#include <commctrl.h> #include <commctrl.h>
#include <commdlg.h> #include <commdlg.h>
#ifndef AUTO_WINSOCK
#ifdef WINSOCK_TWO
#include <winsock2.h>
#else
#include <winsock.h> #include <winsock.h>
#endif
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

6
window.c
View File

@ -1,6 +1,12 @@
#include <windows.h> #include <windows.h>
#include <commctrl.h> #include <commctrl.h>
#ifndef AUTO_WINSOCK
#ifdef WINSOCK_TWO
#include <winsock2.h>
#else
#include <winsock.h> #include <winsock.h>
#endif
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>