bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Add missing include of windows.h in nl_langinfo.c


From: Pavel Hrdina
Subject: [PATCH] Add missing include of windows.h in nl_langinfo.c
Date: Wed, 9 Jul 2014 13:13:07 +0200

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 <address@hidden>
---
 lib/nl_langinfo.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c
index b0be821..b5f2000 100644
--- a/lib/nl_langinfo.c
+++ b/lib/nl_langinfo.c
@@ -23,6 +23,7 @@
 #include <locale.h>
 #include <string.h>
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# include <windows.h>
 # include <stdio.h>
 #endif
 
-- 
1.8.5.5




reply via email to

[Prev in Thread] Current Thread [Next in Thread]