X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fsearch.c;h=217a2942d826d8e58cf4ae69a67d1053d01658cb;hb=94ac5b7c3ff37850210b6fc9a7593cf1c5752993;hp=19e656e3797460ed7b039686e4fb835c70db5ddb;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/runtime/search.c b/src/runtime/search.c
index 19e656e..217a294 100644
--- a/src/runtime/search.c
+++ b/src/runtime/search.c
@@ -9,9 +9,7 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
+#include <string.h>
 
 #include "runtime.h"
 #include "sbcl.h"
@@ -29,7 +27,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;
@@ -42,12 +40,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;
 	}