ICU-4339 Fixes for when STLPort is first in your include path.

X-SVN-Rev: 17113

icu4c/source/common/msvcres.h

@@ -7,5 +7,13 @@
 //header the wrong way. This is here to prevent Visual Studio .NET from
 //unnessarily building the resource files when it's not needed.
 //
+
+/*
+These are defined before unicode/uversion.h in order to prevent 
+STLPort's broken stddef.h from being used when rc.exe parses this file. 
+*/
+#define _STLP_OUTERMOST_HEADER_ID 0
+#define _STLP_WINCE 1
+
 #include "unicode/uversion.h"
 

icu4c/source/data/makedata.mak

@@ -483,7 +483,7 @@ res_index {
 # If you modify this, modify winmode.c in pkgdata.
 "$(ICUTMP)\icudata.res": "$(ICUMISC)\icudata.rc"
 	@echo Creating data DLL version information from $**
-	@rc.exe /i "..\..\..\..\..\include" /r /fo $@ $**
+	@rc.exe /i "..\..\..\..\common" /r /fo $@ $**
 
 # Targets for unames.icu
 "$(ICUBLD)\unames.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\gennames\$(CFG)\gennames.exe"

icu4c/source/data/misc/icudata.rc

@@ -19,7 +19,7 @@
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 
-#include "unicode\utypes.h"
+#include "msvcres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //