Merge branch 'es/freebsd-iconv-portability'
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Sep 2018 21:31:39 +0000 (14:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Sep 2018 21:31:39 +0000 (14:31 -0700)
commitb571c25e33cc8d7ac1cae66e34ce60fa7a0a3b0a
treee6c83e3b6107a5aca60f85b5dac03020e4abea89
parent0a866db570e520ce7b08d1eceefdeaa9d63b6704
parent6c6ce21baa9b50d394bb8ed9878944504ffd57d8
Merge branch 'es/freebsd-iconv-portability'

Build fix.

* es/freebsd-iconv-portability:
  config.mak.uname: resolve FreeBSD iconv-related compilation warning
config.mak.uname