From b5c3f721fa5beaf6f49da5229d562844a12de370 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 10 Jul 2014 18:21:00 +0300 Subject: [PATCH] nl_langinfo: Fix last change. Don't include stdio.h and windows.h twice on MS-Windows. Also, define WIN32_LEAN_AND_MEAN before including windows.h. Signed-off-by: Eric Blake --- ChangeLog | 5 +++++ lib/nl_langinfo.c | 20 ++++---------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1de9b52e48..4e8a5d334f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-07-10 Eli Zaretskii + + nl_langinfo: Fix last change. + * lib/nl_langinfo.c (includes): Drop redundant include. + 2014-07-10 Siddhesh Poyarekar error: Fix -Wundef warnings in glibc diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c index b5f2000d2d..1ab551d090 100644 --- a/lib/nl_langinfo.c +++ b/lib/nl_langinfo.c @@ -23,6 +23,7 @@ #include #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include # include #endif @@ -140,22 +141,9 @@ rpl_nl_langinfo (nl_item item) #else -/* Provide nl_langinfo from scratch. */ - -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - -/* Native Windows platforms. */ - -# define WIN32_LEAN_AND_MEAN /* avoid including junk */ -# include - -# include - -# else - -/* An old Unix platform without locales, such as Linux libc5 or BeOS. */ - -# endif +/* Provide nl_langinfo from scratch, either for native MS-Windows, or + for old Unix platforms without locales, such as Linux libc5 or + BeOS. */ # include -- 2.39.5