simon-git: putty (master): Simon Tatham

Commits to Tartarus hosted VCS tartarus-commits at lists.tartarus.org
Sun Feb 5 12:01:09 GMT 2017


TL;DR:
  2e229cb New makefile, for Windows cross-builds with clang-cl.
  730a9fd clang-specific pragmas to suppress -Wmissing-braces.
  c7f4663 Stop using MS-deprecated names stricmp and strnicmp.
  ca8876f Fix a few more clang-generated warnings.

Repository:     https://git.tartarus.org/simon/putty.git
On the web:     https://git.tartarus.org/?p=simon/putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2017-02-05 12:01:09

commit 2e229cb179ccb35d97160e92b6987b3073496b5f
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=2e229cb179ccb35d97160e92b6987b3073496b5f;hp=bff4b6a2d578c48f3ed5122e4be13d0c6d9543ae
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Feb 5 10:59:08 2017 +0000

    New makefile, for Windows cross-builds with clang-cl.
    
    This was very strange to write, because it's a bizarre combination of
    the GNU-make-isms and rc commands of Makefile.mgw with the cl and link
    commands of Makefile.vc (but also the latter thankfully doesn't need
    those horrible response files).
    
    I've added a big comment in mkfiles.pl about what the build
    requirements for this makefile actually are, which _hopefully_ will be
    usable by people other than me.

 .gitignore |   1 +
 Recipe     |   9 +++++
 mkfiles.pl | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 133 insertions(+), 1 deletion(-)

commit 730a9fdfe3d624bb663557c67f89d2cf8b575964
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=730a9fdfe3d624bb663557c67f89d2cf8b575964;hp=2e229cb179ccb35d97160e92b6987b3073496b5f
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Feb 5 11:19:22 2017 +0000

    clang-specific pragmas to suppress -Wmissing-braces.
    
    When I added some extra braces in commit 095072fa4 to suppress this
    warning, I think in fact I did the wrong thing, because the
    declaration syntax I was originally using is the Microsoft-recommended
    one in spite of clang not liking it - I think MS would be within their
    rights (should they feel like it) to add those missing braces in a
    later version of the WinSock headers, which would make the current
    warning-clean code stop compiling. So it's better to put the code back
    as it was, and avoid the clang warning by using clang's
    warning-suppression pragmas for just those declarations.
    
    I've also done the same thing in winnet.c, for two initialisers of
    IPv6 well-known addresses which had the same problem (but which I
    didn't notice yesterday because a misjudged set of Windows version
    macros had prevented me from compiling that file successfully at all).

 windows/winnet.c   |  7 +++++++
 windows/winsecur.c | 12 ++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

commit c7f466309c5052271adc7e433cc415407ee2325b
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=c7f466309c5052271adc7e433cc415407ee2325b;hp=730a9fdfe3d624bb663557c67f89d2cf8b575964
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Feb 5 11:13:45 2017 +0000

    Stop using MS-deprecated names stricmp and strnicmp.
    
    clang-cl generates warnings saying they're deprecated, in favour of
    the same names but prefixed with an underscore. The warnings are
    coming from the standard MS headers, and I'm already #defining those
    names differently on Unix, so I'll honour them.

 windows/winstuff.h | 5 +++++
 1 file changed, 5 insertions(+)

commit ca8876f0044c2eb7dbc5a61a432e799973e7e51c
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=ca8876f0044c2eb7dbc5a61a432e799973e7e51c;hp=c7f466309c5052271adc7e433cc415407ee2325b
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Feb 5 11:19:12 2017 +0000

    Fix a few more clang-generated warnings.
    
    These are benign, I think. clang warns about casting non-pointer-sized
    integers to pointers, but the Windows API actually does sometimes
    involve values that are either pointers or _small_ integers, so in the
    two cases involved I just cast through ULONG_PTR to silence the
    warning. And clang insists that the integer whose address I give to
    sk_getxdmdata is still uninitialised afterwards, which is just a lie.

 windows/winctrls.c | 2 +-
 windows/window.c   | 3 ++-
 x11fwd.c           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)



More information about the tartarus-commits mailing list