resolve conflict

diff --git a/include/cbm.h b/include/cbm.h
index 5bb860e4fdf1e0b5d4f8ef804fc02394c3740afc..cdbd7b8868e62cd288ab4a37c27a9afa10eadcfc 100644 (file)
--- 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                            */
 /*****************************************************************************/