- NEXT(obj, offset) = PREV(obj, offset) = NULL;
- } else if (obj == swag->head) { /* It's the head */
- swag->head = NEXT(obj, offset);
- PREV(swag->head, offset) = NULL;
- NEXT(obj, offset) = NULL;
- } else if (obj == swag->tail) { /* It's the tail */
- swag->tail = PREV(obj, offset);
- NEXT(swag->tail, offset) = NULL;
- PREV(obj, offset) = NULL;
- } else { /* It's in the middle */
- NEXT(PREV(obj, offset), offset) = NEXT(obj, offset);
- PREV(NEXT(obj, offset), offset) = PREV(obj, offset);
- PREV(obj, offset) = NEXT(obj, offset) = NULL;
+ xbt_swag_getNext(obj, offset) = xbt_swag_getPrev(obj, offset) = NULL;
+ } else if (obj == swag->head) { /* It's the head */
+ swag->head = xbt_swag_getNext(obj, offset);
+ xbt_swag_getPrev(swag->head, offset) = NULL;
+ xbt_swag_getNext(obj, offset) = NULL;
+ } else if (obj == swag->tail) { /* It's the tail */
+ swag->tail = xbt_swag_getPrev(obj, offset);
+ xbt_swag_getNext(swag->tail, offset) = NULL;
+ xbt_swag_getPrev(obj, offset) = NULL;
+ } else { /* It's in the middle */
+ xbt_swag_getNext(xbt_swag_getPrev(obj, offset), offset) = xbt_swag_getNext(obj, offset);
+ xbt_swag_getPrev(xbt_swag_getNext(obj, offset), offset) = xbt_swag_getPrev(obj, offset);
+ xbt_swag_getPrev(obj, offset) = xbt_swag_getNext(obj, offset) = NULL;