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 <eblake@redhat.com>
+2014-07-10 Eli Zaretskii <eliz@gnu.org>
+
+ nl_langinfo: Fix last change.
+ * lib/nl_langinfo.c (includes): Drop redundant include.
+
2014-07-10 Siddhesh Poyarekar <siddhesh@redhat.com>
error: Fix -Wundef warnings in glibc
#include <locale.h>
#include <string.h>
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# define WIN32_LEAN_AND_MEAN /* avoid including junk */
# include <windows.h>
# include <stdio.h>
#endif
#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 <windows.h>
-
-# include <stdio.h>
-
-# 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 <time.h>