github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-05-02 14:40:45 +00:00
Code Issues Projects Releases Wiki Activity

Resolve warning: 'DOS' (and 'SUNDISPLAY') is not defined, evaluates to 0; use #ifdef/#if defined(...)

Browse Source
This commit is contained in:
Nick Briggs
2022-12-25 12:18:30 -08:00
parent 38761fbd93
commit 5c81ca3f41
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bitblt.c
View File

@@ -99,7 +99,7 @@ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl, LispPTR tos)
ScreenLocked = T; ScreenLocked = T;
#endif /* DOS */ #endif /* DOS */
#if SUNDISPLAY || DOS #if defined(SUNDISPLAY) || defined(DOS)
displayflg = cursorin(pbt->pbtdesthi, (pbt->pbtdestlo + (dx >> 4)), w, h, backwardflg) || displayflg = cursorin(pbt->pbtdesthi, (pbt->pbtdestlo + (dx >> 4)), w, h, backwardflg) ||
cursorin(pbt->pbtsourcehi, (pbt->pbtsourcelo + (sx >> 4)), w, h, backwardflg); cursorin(pbt->pbtsourcehi, (pbt->pbtsourcelo + (sx >> 4)), w, h, backwardflg);
#endif /* SUNDISPLAY */ #endif /* SUNDISPLAY */
@@ -115,14 +115,14 @@ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl, LispPTR tos)
num_gray = ((TEXTUREBBT *)pbt)->pbtgrayheightlessone + 1; num_gray = ((TEXTUREBBT *)pbt)->pbtgrayheightlessone + 1;
curr_gray_line = ((TEXTUREBBT *)pbt)->pbtgrayoffset; curr_gray_line = ((TEXTUREBBT *)pbt)->pbtgrayoffset;
#if DOS #ifdef DOS
if (displayflg) (currentdsp->mouse_invisible)(currentdsp, IOPage); if (displayflg) (currentdsp->mouse_invisible)(currentdsp, IOPage);
; ;
#endif /* SUNDISPLAY / DOS */ #endif /* SUNDISPLAY / DOS */
new_bitblt_code; new_bitblt_code;
#if DOS #ifdef DOS
flush_display_lineregion(dx, dstbase, w, h); flush_display_lineregion(dx, dstbase, w, h);
if (displayflg) (currentdsp->mouse_visible)(IOPage->dlmousex, IOPage->dlmousey); if (displayflg) (currentdsp->mouse_visible)(IOPage->dlmousex, IOPage->dlmousey);
#endif /* SUNDISPLAY / DOS */ #endif /* SUNDISPLAY / DOS */

2
src/initkbd.c
View File

@@ -225,7 +225,7 @@ void init_keyboard(int flg) /* if 0 init else re-init */
/* ----------------------------------------------------------------*/ /* ----------------------------------------------------------------*/
void device_before_exit(void) { void device_before_exit(void) {
#if DOS #ifdef DOS
(currentmouse->device.exit)(currentmouse); (currentmouse->device.exit)(currentmouse);
(currentkbd->device.exit)(currentkbd); (currentkbd->device.exit)(currentkbd);
#endif /* SUNDISPLAY DOS*/ #endif /* SUNDISPLAY DOS*/

4
src/xc.c
View File

@@ -110,7 +110,7 @@ extern DspInterface currentdsp;
typedef struct conspage ConsPage; typedef struct conspage ConsPage;
typedef ByteCode *InstPtr; typedef ByteCode *InstPtr;
#if (DOS && OPDISP) #if defined(DOS) && defined(OPDISP)
#include "inlndos.h" #include "inlndos.h"
InstPtr pccache asm("si"); InstPtr pccache asm("si");
LispPTR *cspcache asm("di"); LispPTR *cspcache asm("di");
@@ -211,7 +211,7 @@ void dispatch(void) {
} }
#endif #endif
#if (DOS && OPDISP) #if defined(DOS) && defined(OPDISP)
#else #else
LispPTR *cspcache; LispPTR *cspcache;
LispPTR tscache; LispPTR tscache;