[openssh-commits] [openssh] branch master updated (226d94d -> 48993be)

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a change to branch master
in repository openssh.

      from  226d94d   upstream commit
       new  a647b9b   Put brackets around mblen() compat constant.
       new  48993be   Merge branch 'master' of git.mindrot.org:/var/git/openssh

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit 48993be68461dcfc6f48437e059bf243f4136c4c
Merge: a647b9b 226d94d
Author: Darren Tucker <dtucker at zip.com.au>
Date:   Fri May 8 11:12:27 2015 +1000

    Merge branch 'master' of git.mindrot.org:/var/git/openssh

commit a647b9b8e616c231594b2710c925d31b1b8afea3
Author: Darren Tucker <dtucker at zip.com.au>
Date:   Fri May 8 11:07:27 2015 +1000

    Put brackets around mblen() compat constant.
    
    This might help with the reported problem cross compiling for Android
    ("error: expected identifier or '(' before numeric constant") but
    shouldn't hurt in any case.

Summary of changes:
 openbsd-compat/openbsd-compat.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.