Merge pull request #334 from robwilkens/bug5747

[mono.git] / mcs / class / System / System / GenericUriParserOptions.cs

diff --git a/mcs/class/System/System/GenericUriParserOptions.cs b/mcs/class/System/System/GenericUriParserOptions.cs
index 961572952dc99370f13e7108166aad323a44c830..91e912775cef756cd9986581a43de2843a7e0c05 100644 (file)
--- a/mcs/class/System/System/GenericUriParserOptions.cs
+++ b/mcs/class/System/System/GenericUriParserOptions.cs
@@ -4,7 +4,7 @@
 // Author:
 //     Sebastien Pouliot  <sebastien@ximian.com>
 //
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2005, 2008 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -26,8 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 namespace System {
 
        [Flags]
@@ -42,8 +40,8 @@ namespace System {
                NoFragment = 32,
                DontConvertPathBackslashes = 64,
                DontCompressPath = 128,
-               DontUnescapePathDotsAndSlashes = 256
+               DontUnescapePathDotsAndSlashes = 256,
+               Idn = 512,
+               IriParsing = 1024
        }
 }
-
-#endif