[dotnet]

- fix linking (step 2) git-svn-id: https://svn.parrot.org/parrot/trunk@19930 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
parrot · Jul 17, 2007 · 8abc201 · 8abc201
1 parent 90e0095
commit 8abc201
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/languages/dotnet/pmc/dotnetassembly.pmc b/languages/dotnet/pmc/dotnetassembly.pmc
@@ -454,7 +454,7 @@ static int load_cli_streams(Interp *INTERP, FILE *in, struct dotnet_assembly *as
 
 /* Function for checking if table is present in valid bit vector.
    (Not a macro; stupid C compilers moan about invalid shift sizes. */
-int TablePresent(struct dotnet_assembly *ass, int t)
+static int TablePresent(struct dotnet_assembly *ass, int t)
 {
         return t >= 32 ?
         (ass->valid_hi & (1 << (t - 32))) :

diff --git a/languages/dotnet/pmc/managedpointer.pmc b/languages/dotnet/pmc/managedpointer.pmc
@@ -4,10 +4,6 @@
 #include "tableinfo.h"
 #include "structures.h"
 
-/* ugly, just fix linking, not functional */
-/* How replace Parrot_ManagedPointer_load_pmc calls ? */
-#define Parrot_ManagedPointer_load_pmc(INTERP, SELF)    NULL
-
 
 pmclass ManagedPointer dynpmc group dotnet_runtime {
 
@@ -539,7 +535,7 @@ pmclass ManagedPointer dynpmc group dotnet_runtime {
 
     PMC* get_attr(INTVAL idx)
     {
-        PMC *ref = Parrot_ManagedPointer_load_pmc(INTERP, SELF);
+        PMC *ref = SELF.load_pmc();
         if (ref)
             return VTABLE_get_attr(INTERP, ref, idx);
         else
@@ -548,7 +544,7 @@ pmclass ManagedPointer dynpmc group dotnet_runtime {
 
     PMC* get_attr_str(STRING* idx)
     {
-        PMC *ref = Parrot_ManagedPointer_load_pmc(INTERP, SELF);
+        PMC *ref = SELF.load_pmc();
         if (ref)
             return VTABLE_get_attr_str(INTERP, ref, idx);
         else
@@ -557,14 +553,14 @@ pmclass ManagedPointer dynpmc group dotnet_runtime {
 
     void set_attr(INTVAL idx, PMC* value)
     {
-        PMC *ref = Parrot_ManagedPointer_load_pmc(INTERP, SELF);
+        PMC *ref = SELF.load_pmc();
         if (ref)
             VTABLE_set_attr(INTERP, ref, idx, value);
     }
 
     void set_attr_str(STRING* idx, PMC* value)
     {
-        PMC *ref = Parrot_ManagedPointer_load_pmc(INTERP, SELF);
+        PMC *ref = SELF.load_pmc();
         if (ref)
             VTABLE_set_attr_str(INTERP, ref, idx, value);
     }