Synchronizing with source repository

Source commit: 873a209def0ae65e927754e084367e6ecbe0c7ed

source/packages/jcl/JclDebug.pas

@@ -77,7 +77,9 @@ procedure AssertKindOf(const ClassType: TClass; const Obj: TObject); overload;
 // use TraceMsg
 // procedure Trace(const Msg: string);
 procedure TraceMsg(const Msg: string);
+{$IFNDEF WINSCP}
 procedure TraceFmt(const Fmt: string; const Args: array of const);
+{$ENDIF}
 procedure TraceLoc(const Msg: string);
 procedure TraceLocFmt(const Fmt: string; const Args: array of const);
 

source/putty/putty.h

@@ -1496,4 +1496,5 @@ void putty_finalize();
 // but known to get UTF-8 encoded component (currently private key path only)
 #define MPEXT_BOM "\xEF\xBB\xBF"
 #endif
+
 #endif

source/putty/sshrsa.c

@@ -9,6 +9,7 @@
 
 #include "ssh.h"
 #include "misc.h"
+
 int makekey(unsigned char *data, int len, struct RSAKey *result,
 	    unsigned char **keystr, int order)
 {