diff options
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/alloc.c b/src/alloc.c index 1223f0bc13d..1478ce9ae4e 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1585,21 +1585,6 @@ mark_interval_tree (register INTERVAL tree) | |||
| 1585 | (i) = balance_intervals (i); \ | 1585 | (i) = balance_intervals (i); \ |
| 1586 | } while (0) | 1586 | } while (0) |
| 1587 | 1587 | ||
| 1588 | /* Convert the pointer-sized word P to EMACS_INT while preserving its | ||
| 1589 | type and ptr fields. */ | ||
| 1590 | static Lisp_Object | ||
| 1591 | widen_to_Lisp_Object (void *p) | ||
| 1592 | { | ||
| 1593 | intptr_t i = (intptr_t) p; | ||
| 1594 | #ifdef USE_LISP_UNION_TYPE | ||
| 1595 | Lisp_Object obj; | ||
| 1596 | obj.i = i; | ||
| 1597 | return obj; | ||
| 1598 | #else | ||
| 1599 | return i; | ||
| 1600 | #endif | ||
| 1601 | } | ||
| 1602 | |||
| 1603 | /*********************************************************************** | 1588 | /*********************************************************************** |
| 1604 | String Allocation | 1589 | String Allocation |
| 1605 | ***********************************************************************/ | 1590 | ***********************************************************************/ |
| @@ -4678,7 +4663,7 @@ mark_memory (void *start, void *end) | |||
| 4678 | void *p = *(void **) ((char *) pp + i); | 4663 | void *p = *(void **) ((char *) pp + i); |
| 4679 | mark_maybe_pointer (p); | 4664 | mark_maybe_pointer (p); |
| 4680 | if (POINTERS_MIGHT_HIDE_IN_OBJECTS) | 4665 | if (POINTERS_MIGHT_HIDE_IN_OBJECTS) |
| 4681 | mark_maybe_object (widen_to_Lisp_Object (p)); | 4666 | mark_maybe_object (XIL ((intptr_t) p)); |
| 4682 | } | 4667 | } |
| 4683 | } | 4668 | } |
| 4684 | 4669 | ||