Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/config.in1
-rw-r--r--data/net_2_0/DefaultWsdlHelpGenerator.aspx7
-rw-r--r--data/net_4_0/DefaultWsdlHelpGenerator.aspx7
3 files changed, 13 insertions, 2 deletions
diff --git a/data/config.in b/data/config.in
index a56f7d1c8f6..ecc7692e943 100644
--- a/data/config.in
+++ b/data/config.in
@@ -18,6 +18,7 @@
<dllmap dll="libX11" target="@X11@" os="!windows" />
<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
+ <dllmap dll="libcups" target="libcups.dylib" os="osx"/>
<dllmap dll="i:kernel32.dll">
<dllentry dll="__Internal" name="CopyMemory" target="mono_win32_compat_CopyMemory"/>
<dllentry dll="__Internal" name="FillMemory" target="mono_win32_compat_FillMemory"/>
diff --git a/data/net_2_0/DefaultWsdlHelpGenerator.aspx b/data/net_2_0/DefaultWsdlHelpGenerator.aspx
index 4750b01f141..f4d74bff7f5 100644
--- a/data/net_2_0/DefaultWsdlHelpGenerator.aspx
+++ b/data/net_2_0/DefaultWsdlHelpGenerator.aspx
@@ -474,10 +474,15 @@ private CodeDomProvider GetProvider(string langId)
//
// Document generation
//
+class UTF8StringWriter : StringWriter {
+ public override Encoding Encoding {
+ get { return Encoding.UTF8; }
+ }
+}
string GenerateDocument ()
{
- StringWriter sw = new StringWriter ();
+ UTF8StringWriter sw = new UTF8StringWriter ();
if (CurrentDocType == "wsdl")
descriptions [CurrentDocInd].Write (sw);
diff --git a/data/net_4_0/DefaultWsdlHelpGenerator.aspx b/data/net_4_0/DefaultWsdlHelpGenerator.aspx
index 4750b01f141..f4d74bff7f5 100644
--- a/data/net_4_0/DefaultWsdlHelpGenerator.aspx
+++ b/data/net_4_0/DefaultWsdlHelpGenerator.aspx
@@ -474,10 +474,15 @@ private CodeDomProvider GetProvider(string langId)
//
// Document generation
//
+class UTF8StringWriter : StringWriter {
+ public override Encoding Encoding {
+ get { return Encoding.UTF8; }
+ }
+}
string GenerateDocument ()
{
- StringWriter sw = new StringWriter ();
+ UTF8StringWriter sw = new UTF8StringWriter ();
if (CurrentDocType == "wsdl")
descriptions [CurrentDocInd].Write (sw);