From 9da5d74f1ca513e46ac178f7c37bbeade180eecb Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Tue, 16 Feb 2016 11:40:17 +0000 Subject: [PATCH] Fixing build for windows. Copied from Perforce Change: 189215 ServerID: perforce.ravenbrook.com --- mps/code/comm.nmk | 1 + mps/code/ssw3i3mv.c | 6 ++++-- mps/code/ssw3i6mv.c | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mps/code/comm.nmk b/mps/code/comm.nmk index 523a6831ec5..661e1c6c0c9 100644 --- a/mps/code/comm.nmk +++ b/mps/code/comm.nmk @@ -160,6 +160,7 @@ MPMCOMMON=\ [root] \ [sa] \ [sac] \ + [scan] \ [seg] \ [shield] \ [splay] \ diff --git a/mps/code/ssw3i3mv.c b/mps/code/ssw3i3mv.c index 85d3d750322..c5a1aa15620 100644 --- a/mps/code/ssw3i3mv.c +++ b/mps/code/ssw3i3mv.c @@ -22,7 +22,9 @@ SRCID(ssw3i3mv, "$Id$"); -Res StackScan(ScanState ss, Word *stackBot, Word mask, Word pattern) +Res StackScan(ScanState ss, Word *stackBot, + mps_area_scan_t scan_area, + void *closure, size_t closure_size) { jmp_buf jb; @@ -43,7 +45,7 @@ Res StackScan(ScanState ss, Word *stackBot, Word mask, Word pattern) AVER(offsetof(_JUMP_BUFFER, Esi) == offsetof(_JUMP_BUFFER, Ebx) + 8); return StackScanInner(ss, stackBot, (Word *)&((_JUMP_BUFFER *)jb)->Ebx, 3, - mask, pattern); + scan_area, closure, closure_size); } /* C. COPYRIGHT AND LICENSE diff --git a/mps/code/ssw3i6mv.c b/mps/code/ssw3i6mv.c index 62c7b023cb1..a146e28d22f 100644 --- a/mps/code/ssw3i6mv.c +++ b/mps/code/ssw3i6mv.c @@ -30,7 +30,9 @@ SRCID(ssw3i6mv, "$Id$"); -Res StackScan(ScanState ss, Word *stackBot, Word mask, Word pattern) +Res StackScan(ScanState ss, Word *stackBot, + mps_area_scan_t scan_area, + void *closure, size_t closure_size) { jmp_buf jb; @@ -62,7 +64,7 @@ Res StackScan(ScanState ss, Word *stackBot, Word mask, Word pattern) AVER(offsetof(_JUMP_BUFFER, R15) == offsetof(_JUMP_BUFFER, Rbx) + 64); return StackScanInner(ss, stackBot, (Word *)&((_JUMP_BUFFER *)jb)->Rbx, 9, - mask, pattern); + scan_area, closure, closure_size); } /* C. COPYRIGHT AND LICENSE