Since MOBILE implies NET_4_* now, take this into account and simplify our ifdefs.

[mono.git] / mcs / class / corlib / System / TimeSpan.cs

diff --git a/mcs/class/corlib/System/TimeSpan.cs b/mcs/class/corlib/System/TimeSpan.cs
index 6f322d0f868614ebe9f3419d49ff5b9f4ad2d680..67d8c897a12863abd274674bef533a07b58c5494 100644 (file)
--- a/mcs/class/corlib/System/TimeSpan.cs
+++ b/mcs/class/corlib/System/TimeSpan.cs
@@ -39,7 +39,7 @@ namespace System
        [Serializable]
        [System.Runtime.InteropServices.ComVisible (true)]
        public struct TimeSpan : IComparable, IComparable<TimeSpan>, IEquatable <TimeSpan>
-#if NET_4_0 || MOBILE
+#if NET_4_0
                                 , IFormattable
 #endif
        {
@@ -359,7 +359,7 @@ namespace System
                        return p.Execute (true, out result);
                }
 
-#if NET_4_0 || MOBILE
+#if NET_4_0
                public static TimeSpan Parse (string input, IFormatProvider formatProvider)
                {
                        if (input == null)
@@ -526,7 +526,7 @@ namespace System
                        return sb.ToString ();
                }
 
-#if NET_4_0 || MOBILE
+#if NET_4_0
                public string ToString (string format)
                {
                        return ToString (format, null);
@@ -719,7 +719,7 @@ namespace System
                        private int _cur = 0;
                        private int _length;
                        ParseError parse_error;
-#if NET_4_0 || MOBILE
+#if NET_4_0
                        bool parsed_ticks;
                        NumberFormatInfo number_format;
                        int parsed_numbers_count;
@@ -735,12 +735,12 @@ namespace System
                        {
                                _src = src;
                                _length = _src.Length;
-#if NET_4_0 || MOBILE
+#if NET_4_0
                                number_format = GetNumberFormatInfo (null);
 #endif
                        }
 
-#if NET_4_0 || MOBILE
+#if NET_4_0
                        // Reset state data, so we can execute another parse over the input.
                        void Reset ()
                        {
@@ -806,7 +806,7 @@ namespace System
                                return res;
                        }
 
-#if NET_4_0 || MOBILE
+#if NET_4_0
                        // Used for custom formats parsing, where we may need to declare how
                        // many digits we expect, as well as the maximum allowed.
                        private int ParseIntExact (int digit_count, int max_digit_count)
@@ -855,7 +855,7 @@ namespace System
 
                                if (!optional && (count == 0))
                                        SetParseError (ParseError.Format);
-#if NET_4_0 || MOBILE
+#if NET_4_0
                                if (count > 0)
                                        parsed_numbers_count++;
 #endif
@@ -863,7 +863,7 @@ namespace System
                                return (int)res;
                        }
 
-#if NET_4_0 || MOBILE
+#if NET_4_0
                        // This behaves pretty much like ParseOptDot, but we need to have it
                        // as a separated routine for both days and decimal separators.
                        private bool ParseOptDaysSeparator ()
@@ -962,7 +962,7 @@ namespace System
 
                                if (!digitseen)
                                        SetParseError (ParseError.Format);
-#if NET_4_0 || MOBILE
+#if NET_4_0
                                else if (!AtEnd && Char.IsDigit (_src, _cur))
                                        SetParseError (ParseError.Overflow);
 
@@ -972,7 +972,7 @@ namespace System
                                return res;
                        }
 
-#if NET_4_0 || MOBILE
+#if NET_4_0
                        // Used by custom formats parsing
                        // digits_count = 0 for digits up to max_digits_count (optional), and other value to
                        // force a precise number of digits.
@@ -1006,7 +1006,7 @@ namespace System
                                parse_error = error;
                        }
 
-#if NET_4_0 || MOBILE
+#if NET_4_0
                        bool CheckParseSuccess (bool tryParse)
 #else
                        bool CheckParseSuccess (int hours, int minutes, int seconds, bool tryParse)
@@ -1014,7 +1014,7 @@ namespace System
                        {
                                // We always report the first error, but for 2.0 we need to give a higher
                                // precence to per-element overflow (as opposed to int32 overflow).
-#if NET_4_0 || MOBILE
+#if NET_4_0
                                if (parse_error == ParseError.Overflow) {
 #else
                                if (parse_error == ParseError.Overflow || hours > 23 || minutes > 59 || seconds > 59) {
@@ -1035,7 +1035,7 @@ namespace System
                                return true;
                        }
 
-#if NET_4_0 || MOBILE
+#if NET_4_0
                        // We are using a different parse approach in 4.0, due to some changes in the behaviour
                        // of the parse routines.
                        // The input string is documented as:
@@ -1219,7 +1219,7 @@ namespace System
                        }
 #endif
 
-#if NET_4_0 || MOBILE
+#if NET_4_0
                        public bool ExecuteWithFormat (string format, TimeSpanStyles style, bool tryParse, out TimeSpan result)
                        {
                                int days, hours, minutes, seconds;
@@ -1326,7 +1326,7 @@ namespace System
                        }
 #endif
                }
-#if NET_4_0 || MOBILE
+#if NET_4_0
                enum FormatElementType 
                {
                        Days,