Mercurial > hg > octave-nkf > gnulib-hg
changeset 17717:538814e2b813
nl_langinfo: fix build under mingw
The commit fcfce839 improved localization of names for week days
and months, but the author forget to include windows.h in order
to use 'GetACP ()'. Without this header file build using mingw
fails with this error message:
../../../gnulib/lib/nl_langinfo.c: In function 'ctype_codeset':
../../../gnulib/lib/nl_langinfo.c:76:5: warning: implicit declaration of
function 'GetACP' [-Wimplicit-function-declaration]
sprintf (buf + 2, "%u", GetACP ());
^
In file included from
/usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:73:0,
from ../../../gnulib/lib/nl_langinfo.c:149:
/usr/i686-w64-mingw32/sys-root/mingw/include/winnls.h: At top level:
/usr/i686-w64-mingw32/sys-root/mingw/include/winnls.h:653:64: error:
conflicting types for 'GetACP'
WINBASEAPI UINT WINAPI GetACP(void);
^
../../../gnulib/lib/nl_langinfo.c:76:29: note: previous implicit
declaration of 'GetACP' was here
sprintf (buf + 2, "%u", GetACP ());
^
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
| author | Pavel Hrdina <phrdina@redhat.com> |
|---|---|
| date | Wed, 09 Jul 2014 13:13:07 +0200 |
| parents | e21d762f0e7e |
| children | cc408fc7021c |
| files | ChangeLog lib/nl_langinfo.c |
| diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-07-09 Pavel Hrdina <phrdina@redhat.com> (tiny change) + + nl_langinfo: fix build under mingw + * lib/nl_langinfo.c (includes): Pick up <windows.h> for GetACP(). + 2014-07-09 Andrew D Warshall <warshall@99main.com> mountlist: do not classify a bind-mounted dir entry as "dummy"