From c1425595ec8193f7a2e750ac0f70307f9e17f050 Mon Sep 17 00:00:00 2001
From: Michael Ow <mow@svn.icu-project.org>
Date: Fri, 13 Nov 2009 01:47:05 +0000
Subject: [PATCH] ICU-7232 Fix some Windows compilation errors.

X-SVN-Rev: 26893
---
 icu4c/source/common/common.vcproj | 4 ++++
 icu4c/source/common/uloc.c        | 3 ++-
 icu4c/source/common/ureslocs.h    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/icu4c/source/common/common.vcproj b/icu4c/source/common/common.vcproj
index 322f03da5a..1433f2b2b4 100644
--- a/icu4c/source/common/common.vcproj
+++ b/icu4c/source/common/common.vcproj
@@ -2929,6 +2929,10 @@
 				RelativePath=".\uresdata.h"
 				>
 			</File>
+			<File
+				RelativePath=".\ureslocs.h"
+				>
+			</File>
 			<File
 				RelativePath=".\uresimp.h"
 				>
diff --git a/icu4c/source/common/uloc.c b/icu4c/source/common/uloc.c
index c478665f41..060914e6ec 100644
--- a/icu4c/source/common/uloc.c
+++ b/icu4c/source/common/uloc.c
@@ -2290,6 +2290,7 @@ _getDisplayNameForComponent(const char *locale,
     char localeBuffer[ULOC_FULLNAME_CAPACITY*4];
     int32_t length;
     UErrorCode localStatus;
+    char* root = NULL;
 
     /* argument checking */
     if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
@@ -2311,7 +2312,7 @@ _getDisplayNameForComponent(const char *locale,
         return u_terminateUChars(dest, destCapacity, 0, pErrorCode);
     }
 
-    char* root = tag == _kCountries ? U_ICUDATA_REGION : U_ICUDATA_LANG;
+    root = tag == _kCountries ? U_ICUDATA_REGION : U_ICUDATA_LANG;
 
     return _getStringOrCopyKey(root, displayLocale,
                                tag, NULL, localeBuffer,
diff --git a/icu4c/source/common/ureslocs.h b/icu4c/source/common/ureslocs.h
index 46a2f30d06..363da2673b 100644
--- a/icu4c/source/common/ureslocs.h
+++ b/icu4c/source/common/ureslocs.h
@@ -9,7 +9,7 @@
 #define __URESLOCS_H__
 
 #include "unicode/utypes.h"
-#include <unicode/udata.h>
+#include "unicode/udata.h"
 
 U_CDECL_BEGIN