Merge pull request #726 from pruiz/xamarin-bug-13708

[mono.git] / mcs / class / corlib / System.Globalization / PersianCalendar.cs

diff --git a/mcs/class/corlib/System.Globalization/PersianCalendar.cs b/mcs/class/corlib/System.Globalization/PersianCalendar.cs
index de823fe112556ea9a131ad73daf2dc105461cf32..576abb7a18a81f68d9c2998b87967ac7f1b697b2 100644 (file)
--- a/mcs/class/corlib/System.Globalization/PersianCalendar.cs
+++ b/mcs/class/corlib/System.Globalization/PersianCalendar.cs
@@ -1,5 +1,5 @@
 //
-// PersianCalendar.cs: Implements the Persian calendar
+// System.Globalization.PersianCalendar.cs
 //
 // Authors:
 //   Roozbeh Pournader (roozbeh@farsiweb.info)
@@ -29,8 +29,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 namespace System.Globalization {
 
 using System;
@@ -66,9 +64,7 @@ using System.Runtime.InteropServices;
 /// on the mean tropical year, not the mean March equinoctial year.
 /// </para>
 /// </remarks>
-#if NET_2_0
 [Serializable]
-#endif
 public class PersianCalendar : Calendar {
        /// <summary>
        /// Constructor.
@@ -501,12 +497,10 @@ public class PersianCalendar : Calendar {
                return PersianEra;
        }
 
-#if NET_2_0
        public override int GetLeapMonth (int year, int era)
        {
                return 0;
        }
-#endif
 
        /// <summary>
        /// Overridden. Gives the number of the month of the specified
@@ -677,14 +671,14 @@ public class PersianCalendar : Calendar {
        /// </exception>
        public override DateTime ToDateTime(int year, int month, int day,
                                            int hour, int minute,
-                                           int second, int milliseconds,
+                                           int second, int millisecond,
                                            int era)
        {
                M_CheckYMDE(year, month, day, ref era);
-               M_CheckHMSM(hour, minute, second, milliseconds);
+               M_CheckHMSM(hour, minute, second, millisecond);
                int rd = fixed_from_dmy(day, month, year);
                return CCFixed.ToDateTime(rd,
-                       hour, minute, second, milliseconds);
+                       hour, minute, second, millisecond);
        }
 
        // FIXME: Calendar.cs and HebrewCalendar.cs are different in
@@ -703,7 +697,6 @@ public class PersianCalendar : Calendar {
                        return baseCentury + year - 100;
        }
 
-#if NET_2_0
        public override CalendarAlgorithmType AlgorithmType {
                get {
                        return CalendarAlgorithmType.SolarCalendar;
@@ -724,9 +717,6 @@ public class PersianCalendar : Calendar {
                        return PersianMax;
                }
        }
-#endif
 } // class PersianCalendar
        
 } // namespace System.Globalization
-
-#endif