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

Cleanup errors introduced resolving rebase conflicts.

Browse Source
This commit is contained in:
Nick Briggs
2023-02-19 10:43:55 -08:00
parent 11c7df5813
commit 2474619e83
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/initdsp.c
View File

@@ -57,7 +57,6 @@ extern DspInterface currentdsp;
int FrameBufferFd = -1;
extern int sdl_displaywidth, sdl_displayheight, sdl_pixelscale;
int sdl_displaywidth, sdl_displayheight, sdl_pixelscale;
extern unsigned displaywidth, displayheight, DisplayRasterWidth, DisplayType, DisplayByteSize;
unsigned displaywidth, displayheight, DisplayRasterWidth, DisplayType, DisplayByteSize;
DLword *DisplayRegion68k; /* 68k addr of #{}22,0 */
@@ -265,7 +264,6 @@ in_display_segment(baseaddr)
/* */
/************************************************************************/
<<<<<<< HEAD
void flush_display_buffer(void) {
#ifdef SDL
sdl_notify_damage(0, 0, sdl_displaywidth, sdl_displayheight);