resolve conflict

2017-08-06 20:20:22 +02:00
parent dafe3c1e3c
commit 99e6dd18d6
1 changed files with 5 additions and 0 deletions
--- 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                            */
 /*****************************************************************************/