github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-05-01 22:26:50 +00:00
Code Issues Projects Releases Wiki Activity

Change names of block local variables causing shadowing warnings.

Browse Source 
Remove duplicate function prototype declaration (duplicate in inc/returndefs.h)

	modified:   inc/return.h
This commit is contained in:
Nick Briggs
2020-12-08 10:20:07 -08:00
parent be3ffd746c
commit af30a6d5a9
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
inc/return.h
View File

@@ -96,19 +96,17 @@
#define AFTER_CONTEXTSW \ #define AFTER_CONTEXTSW \
{ register DLword *ptr68k,*freeptr; \ { register DLword *ac_ptr68k,*ac_freeptr; \
ptr68k = (DLword*)Addr68k_from_StkOffset(CURRENTFX->nextblock); \ ac_ptr68k = (DLword*)Addr68k_from_StkOffset(CURRENTFX->nextblock); \
if(GETWORD(ptr68k) != STK_FSB_WORD) error("pre_moveframe: MP9316"); \ if(GETWORD(ac_ptr68k) != STK_FSB_WORD) error("pre_moveframe: MP9316"); \
CHECK_FX(CURRENTFX); \ CHECK_FX(CURRENTFX); \
freeptr=ptr68k; \ ac_freeptr=ac_ptr68k; \
while(GETWORD(freeptr) == STK_FSB_WORD) \ while(GETWORD(ac_freeptr) == STK_FSB_WORD) \
EndSTKP=freeptr=freeptr+ GETWORD(freeptr+1); \ EndSTKP=ac_freeptr=ac_freeptr+ GETWORD(ac_freeptr+1); \
S_CHECK(CURRENTFX->incall== NIL, "CONTEXTSW during fn call"); \ S_CHECK(CURRENTFX->incall== NIL, "CONTEXTSW during fn call"); \
/*S_CHECK(CURRENTFX->nopush== NIL, "CONTEXTSW, NOPUSH is set"); ** JDS 4/9/96 this seems not to matter, so I removed it. */\ /*S_CHECK(CURRENTFX->nopush== NIL, "CONTEXTSW, NOPUSH is set"); ** JDS 4/9/96 this seems not to matter, so I removed it. */\
CurrentStackPTR = ptr68k- 2 ; \ CurrentStackPTR = ac_ptr68k- 2 ; \
CHECK_FX(CURRENTFX); \ CHECK_FX(CURRENTFX); \
S_CHECK( EndSTKP > CurrentStackPTR, \ S_CHECK( EndSTKP > CurrentStackPTR, \
"End of stack isn't beyond current stk pointer."); \ "End of stack isn't beyond current stk pointer."); \
} }
void contextsw(register DLword fxnum, register DLword bytenum, register DLword flags);