From 2f291713e1f76c93cd35e584547e94f31a0595d4 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sun, 10 Oct 2004 19:18:31 +0000
Subject: [PATCH]   * fixed aligntoptr

---
 rtl/inc/objpas.inc    | 9 ++++++---
 rtl/objpas/typinfo.pp | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/rtl/inc/objpas.inc b/rtl/inc/objpas.inc
index d8cd08c8c1..098e46228a 100644
--- a/rtl/inc/objpas.inc
+++ b/rtl/inc/objpas.inc
@@ -132,8 +132,8 @@
     {$ifdef FPC_REQUIRES_PROPER_ALIGNMENT}
         if (ptrint(p) mod sizeof(ptrint))<>0 then
           inc(ptrint(p),sizeof(ptrint)-ptrint(p) mod sizeof(ptrint));
-        result:=p;
     {$endif FPC_REQUIRES_PROPER_ALIGNMENT}
+        result:=p;
       end;
 
 
@@ -758,7 +758,10 @@
 
 {
   $Log$
-  Revision 1.40  2004-10-05 20:21:23  florian
+  Revision 1.41  2004-10-10 19:18:31  florian
+    * fixed aligntoptr
+
+  Revision 1.40  2004/10/05 20:21:23  florian
     * bootstrapping with rtti alignment fixed
 
   Revision 1.39  2004/10/04 21:26:16  florian
@@ -808,4 +811,4 @@
   Revision 1.25  2002/08/31 13:11:11  florian
     * several fixes for Linux/PPC compilation
 
-}
+}
\ No newline at end of file
diff --git a/rtl/objpas/typinfo.pp b/rtl/objpas/typinfo.pp
index 6e675d0de9..3415d689fb 100644
--- a/rtl/objpas/typinfo.pp
+++ b/rtl/objpas/typinfo.pp
@@ -290,8 +290,8 @@ function aligntoptr(p : pointer) : pointer;
 {$ifdef FPC_REQUIRES_PROPER_ALIGNMENT}
     if (ptrint(p) mod sizeof(ptrint))<>0 then
       inc(ptrint(p),sizeof(ptrint)-ptrint(p) mod sizeof(ptrint));
-    result:=p;
 {$endif FPC_REQUIRES_PROPER_ALIGNMENT}
+    result:=p;
   end;
 
 
@@ -1490,7 +1490,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.29  2004-10-04 21:26:16  florian
+  Revision 1.30  2004-10-10 19:18:31  florian
+    * fixed aligntoptr
+
+  Revision 1.29  2004/10/04 21:26:16  florian
     * rtti alignment fixed
 
   Revision 1.28  2004/08/16 16:12:28  peter
@@ -1542,4 +1545,4 @@ end.
 
   Revision 1.13  2002/04/04 18:32:59  peter
     * merged getpropinfo fix
-}
+}
\ No newline at end of file