From: Daniel Jacobowitz <drow@false.org>
Date: Sun, 14 Mar 2010 22:38:38 +0000 (+0000)
Subject: 	* charset.c [USE_WIN32API]: Include <windows.h>.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=43484f03bca7640119e4e51441b6fb340d802a5f;p=binutils-gdb.git

	* charset.c [USE_WIN32API]: Include <windows.h>.
	 (_initialize_charset): Correct type of w32_host_default_charset.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e75d65bf110..39440766333 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-14  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* charset.c [USE_WIN32API]: Include <windows.h>.
+	 (_initialize_charset): Correct type of w32_host_default_charset.
+
 2010-03-14  Pedro Alves  <pedro@codesourcery.com>
 
 	* infrun.c (ptid_match): Don't assert that PTID is not a pid ptid.
diff --git a/gdb/charset.c b/gdb/charset.c
index 9c1e7f48e70..b60c5fab499 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -33,6 +33,9 @@
 #include "gdb_string.h"
 #include <ctype.h>
 
+#ifdef USE_WIN32API
+#include <windows.h>
+#endif
 
 /* How GDB's character set support works
 
@@ -932,7 +935,7 @@ _initialize_charset (void)
   auto_target_charset_name = auto_host_charset_name;
 #elif defined (USE_WIN32API)
   {
-    static w32_host_default_charset[16]; /* "CP" + x<=5 digits + paranoia. */
+    static char w32_host_default_charset[16]; /* "CP" + x<=5 digits + paranoia. */
 
     snprintf (w32_host_default_charset, sizeof w32_host_default_charset,
 	      "CP%d", GetACP());