From 99e6dd18d680382c7780f0569329a89be386493d Mon Sep 17 00:00:00 2001 From: mrdudz Date: Sun, 6 Aug 2017 20:20:22 +0200 Subject: [PATCH] resolve conflict --- include/cbm.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/cbm.h b/include/cbm.h index 5bb860e4f..cdbd7b886 100644 --- a/include/cbm.h +++ b/include/cbm.h @@ -161,6 +161,11 @@ unsigned char kbrepeat(unsigned char); unsigned char kbrepeatdelay(unsigned char); unsigned char kbrepeatrate(unsigned char); +#if !defined(__CBM610__) && !defined(__PET__) +void waitvsync (void); +/* wait for the start of the next frame */ +#endif + /*****************************************************************************/ /* CBM kernal functions */ /*****************************************************************************/ -- 2.39.5