From: mrdudz <mrdudz@users.noreply.github.com>
Date: Sun, 6 Aug 2017 18:20:22 +0000 (+0200)
Subject: resolve conflict
X-Git-Tag: V2.17~104^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=99e6dd18d680382c7780f0569329a89be386493d;p=cc65

resolve conflict
---

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                            */
 /*****************************************************************************/