X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fsearch.c;h=e2d642bd90477d740926a88d209e2ea07cc59f35;hb=29a9ccc860532b32c566aec095f570e999a9c52c;hp=01de0d1cae94982eb58430b99fbee963164a77a5;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git

diff --git a/src/runtime/search.c b/src/runtime/search.c
index 01de0d1..e2d642b 100644
--- a/src/runtime/search.c
+++ b/src/runtime/search.c
@@ -25,7 +25,7 @@ boolean search_for_type(int type, lispobj **start, int *count)
         if (*count != -1)
             *count -= 2;
 
-        if (TypeOf(obj) == type)
+        if (widetag_of(obj) == type)
             return 1;
 
         (*start) += 2;
@@ -38,12 +38,12 @@ boolean search_for_symbol(char *name, lispobj **start, int *count)
     struct symbol *symbol;
     struct vector *symbol_name;
 
-    while (search_for_type(type_SymbolHeader, start, count)) {
-        symbol = (struct symbol *)PTR((lispobj)*start);
-	if (LowtagOf(symbol->name) == type_OtherPointer) {
-            symbol_name = (struct vector *)PTR(symbol->name);
+    while (search_for_type(SYMBOL_HEADER_WIDETAG, start, count)) {
+        symbol = (struct symbol *)native_pointer((lispobj)*start);
+	if (lowtag_of(symbol->name) == OTHER_POINTER_LOWTAG) {
+            symbol_name = (struct vector *)native_pointer(symbol->name);
             if (is_valid_lisp_addr((os_vm_address_t)symbol_name) &&
-		TypeOf(symbol_name->header) == type_SimpleString &&
+		widetag_of(symbol_name->header) == SIMPLE_STRING_WIDETAG &&
 		strcmp((char *)symbol_name->data, name) == 0)
                 return 1;
 	}