From 2474619e83efbbea737abe90660e921acf14da84 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sun, 19 Feb 2023 10:43:55 -0800 Subject: [PATCH] Cleanup errors introduced resolving rebase conflicts. --- src/initdsp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/initdsp.c b/src/initdsp.c index 285450e..05466af 100644 --- a/src/initdsp.c +++ b/src/initdsp.c @@ -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);