changing name of local sexp_in_heap_p to avoid conflict with the global def

This commit is contained in:
Alex Shinn 2011-02-12 21:25:26 +09:00
parent 52d0322910
commit c7b167dd10

View file

@ -20,7 +20,7 @@
#define sexp_cookie_close_set(vec, x) sexp_vector_set((sexp)vec, SEXP_FIVE, x) #define sexp_cookie_close_set(vec, x) sexp_vector_set((sexp)vec, SEXP_FIVE, x)
#if ! SEXP_USE_BOEHM #if ! SEXP_USE_BOEHM
static int sexp_in_heap_p (sexp_heap h, sexp p) { static int in_heap_p (sexp_heap h, sexp p) {
for ( ; h; h = h->next) for ( ; h; h = h->next)
if (((sexp)h < p) && (p < (sexp)((char*)h + h->size))) if (((sexp)h < p) && (p < (sexp)((char*)h + h->size)))
return 1; return 1;
@ -36,7 +36,7 @@ static sexp sexp_last_context (sexp ctx, sexp *cstack) {
sexp_heap h = sexp_context_heap(ctx); sexp_heap h = sexp_context_heap(ctx);
for (i=0; i<SEXP_LAST_CONTEXT_CHECK_LIMIT; i++) { for (i=0; i<SEXP_LAST_CONTEXT_CHECK_LIMIT; i++) {
p = cstack[i]; p = cstack[i];
if (p && (p != ctx) && sexp_pointerp(p) && sexp_in_heap_p(h, p) if (p && (p != ctx) && sexp_pointerp(p) && in_heap_p(h, p)
&& (sexp_pointer_tag(p) == SEXP_CONTEXT) && (sexp_pointer_tag(p) == SEXP_CONTEXT)
&& (sexp_context_heap(p) == h)) { && (sexp_context_heap(p) == h)) {
res = p; res = p;