1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00

Prevent double-inclusion of ssh.h in case of -DNO_SECURITY.

winshare.c includes ssh.h, but if you defined NO_SECURITY it then
decides to fall back to including the stub noshare.c, which includes
ssh.h again. Fix by moving a block of includes inside the ifdef.

[originally from svn r10184]
This commit is contained in:
Simon Tatham 2014-04-23 14:05:31 +00:00
parent 01d359f4f6
commit 566405ae68

View File

@ -5,6 +5,8 @@
#include <stdio.h>
#include <assert.h>
#if !defined NO_SECURITY
#define DEFINE_PLUG_METHOD_MACROS
#include "tree234.h"
#include "putty.h"
@ -12,8 +14,6 @@
#include "proxy.h"
#include "ssh.h"
#if !defined NO_SECURITY
#include "winsecur.h"
#define CONNSHARE_PIPE_PREFIX "\\\\.\\pipe\\putty-connshare"