Author: toshok
Date: 2007-06-22 02:45:49 -0400 (Fri, 22 Jun 2007)
New Revision: 80526

Modified:
   trunk/moon/src/animation.h
   trunk/moon/src/clock.h
   trunk/moon/src/value.h
   trunk/moon/src/value.h.in
Log:
add padding to these structs so that that their 8 byte aligned members are 
properly padded in both 32bit and 64bit systems.

Modified: trunk/moon/src/animation.h
===================================================================
--- trunk/moon/src/animation.h  2007-06-22 06:27:10 UTC (rev 80525)
+++ trunk/moon/src/animation.h  2007-06-22 06:45:49 UTC (rev 80526)
@@ -88,6 +88,7 @@
 
   private:
        KeyTimeType k;
+       gint32 padding;
        double percent;
        TimeSpan timespan;
 };

Modified: trunk/moon/src/clock.h
===================================================================
--- trunk/moon/src/clock.h      2007-06-22 06:27:10 UTC (rev 80525)
+++ trunk/moon/src/clock.h      2007-06-22 06:45:49 UTC (rev 80526)
@@ -60,8 +60,9 @@
        // This should live in a TimeSpan class, but oh well.. */
        static Duration FromSeconds (int seconds) { return Duration 
((TimeSpan)seconds * 1000000); }
 
+ private:
        DurationKind k;
- private:
+       gint32 padding;
        TimeSpan timespan;
 };
 
@@ -121,8 +122,9 @@
        bool HasCount() { return k == COUNT; }
        bool HasDuration () { return k == DURATION; }
 
+  private:
        RepeatKind k;
-  private:
+       gint32 padding;
        double count;
        TimeSpan duration;
 };

Modified: trunk/moon/src/value.h
===================================================================
--- trunk/moon/src/value.h      2007-06-22 06:27:10 UTC (rev 80525)
+++ trunk/moon/src/value.h      2007-06-22 06:45:49 UTC (rev 80526)
@@ -329,6 +329,9 @@
   
   private:
        Type::Kind k;
+
+       gint32 padding;
+
        union {
                double d;
                guint64 ui64;

Modified: trunk/moon/src/value.h.in
===================================================================
--- trunk/moon/src/value.h.in   2007-06-22 06:27:10 UTC (rev 80525)
+++ trunk/moon/src/value.h.in   2007-06-22 06:45:49 UTC (rev 80526)
@@ -105,6 +105,9 @@
   
   private:
        Type::Kind k;
+
+       gint32 padding;
+
        union {
                double d;
                guint64 ui64;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to