simon-git: putty (master): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  d700c33 Avoid -Wmisleading-indentation warnings with GCC 6.
  c026b48 Fix strict-aliasing warnings in sk_tcp_peer_info.

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2016-01-30 14:36:57

commit d700c33422926dda1b4af90bf1fcd262b03cfca8
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=d700c33422926dda1b4af90bf1fcd262b03cfca8;hp=9351a5bfe4b1630227581d77f1aff4ca729ab8c1
Author: Colin Watson <cjwatson at debian.org>
Date:   Thu Jan 28 21:19:41 2016 +0000

    Avoid -Wmisleading-indentation warnings with GCC 6.
    
    GCC 6 warns about potentially misleading indentation, such as:
    
        if (condition) stmt1; stmt2;
    
    Chaining multiple ifs on a single line runs into this warning, even if
    it's probably not actually misleading to a human eye, so just add a
    couple of newlines to pacify the compiler.

 cproxy.c |    3 ++-
 proxy.c  |    6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

commit c026b48c537250ac03573845ff9da6fd9f45776d
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=c026b48c537250ac03573845ff9da6fd9f45776d;hp=d700c33422926dda1b4af90bf1fcd262b03cfca8
Author: Colin Watson <cjwatson at debian.org>
Date:   Thu Jan 28 21:22:07 2016 +0000

    Fix strict-aliasing warnings in sk_tcp_peer_info.
    
    GCC 6 emits strict-aliasing warnings here, so use the existing
    sockaddr_union arrangements to avoid those.  As a prerequisite for being
    able to express sk_tcp_peer_info in terms of sockaddr_union, I fixed up
    the union elements to be a bit less odd in the NO_IPV6 case.

 unix/uxnet.c |   29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)