From 1eb685d16ef91b7401082f106ff1be75bd50e0b5 Mon Sep 17 00:00:00 2001
From: Merlijn Wajer <merlijn@wizzup.org>
Date: Sat, 27 Mar 2010 13:14:18 +0100
Subject: [PATCH 1/2] Merge?

---
 Projects/MMLLib/test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Projects/MMLLib/test.py b/Projects/MMLLib/test.py
index 9d4f54a..d6e6003 100755
--- a/Projects/MMLLib/test.py
+++ b/Projects/MMLLib/test.py
@@ -36,8 +36,8 @@ dll.printpoints.argtypes = [PPOINT, c_int]
 
 d = dll.printpoints(c, 2)
 
-#dll.hoi.restype = None
-#dll.hoi.argtypes = [POINTER(c_int)]
+dll.hoi.restype = None
+dll.hoi.argtypes = [POINTER(c_int)]
 
 e = c_int(5)
 dll.hoi(byref(e))

From c1005636223bfc2f8e1cba99a35e8de8b8617dc5 Mon Sep 17 00:00:00 2001
From: Merlijn Wajer <merlijn@wizzup.org>
Date: Sat, 27 Mar 2010 13:15:48 +0100
Subject: [PATCH 2/2] Fix 64 bit compilation

---
 Units/Misc/PSDump.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Units/Misc/PSDump.pas b/Units/Misc/PSDump.pas
index 92fb877..6265231 100644
--- a/Units/Misc/PSDump.pas
+++ b/Units/Misc/PSDump.pas
@@ -175,7 +175,7 @@ procedure TPSScriptExtension.GetCodeProps;
         Result := Result + 'property ' + ci.OrgName + s;
         if (ci.Decl.Result <> nil) then
           Result := Result + ': '+ TypeToString(ci.Decl.Result);
-        if (Cardinal(ci) = Def) then
+        if (PtrUInt(ci) = Def) then
           Result := Result + '; default';
         Result := Result + '; ';
       end;