Merge pull request #231 from linquize/a853199c497bb0977970974303fac7e42080809d

[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..acd940952dddd060ecb65d3722730cf47220a76f 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,12 +26,13 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 namespace System {
 
        [Flags]
-       public enum GenericUriParserOptions {
+#if NET_2_0
+       public
+#endif
+       enum GenericUriParserOptions {
 
                Default = 0,
                GenericAuthority = 1,
@@ -42,8 +43,8 @@ namespace System {
                NoFragment = 32,
                DontConvertPathBackslashes = 64,
                DontCompressPath = 128,
-               DontUnescapePathDotsAndSlashes = 256
+               DontUnescapePathDotsAndSlashes = 256,
+               Idn = 512,
+               IriParsing = 1024
        }
 }
-
-#endif