1
0
mirror of https://github.com/cc65/cc65.git synced 2024-06-08 15:29:37 +00:00

resolve conflict

This commit is contained in:
mrdudz 2017-08-06 20:20:22 +02:00
parent dafe3c1e3c
commit 99e6dd18d6

View File

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