mirror of
https://github.com/cc65/cc65.git
synced 2025-02-09 02:30:42 +00:00
resolve conflict
This commit is contained in:
parent
dafe3c1e3c
commit
99e6dd18d6
@ -161,6 +161,11 @@ unsigned char kbrepeat(unsigned char);
|
|||||||
unsigned char kbrepeatdelay(unsigned char);
|
unsigned char kbrepeatdelay(unsigned char);
|
||||||
unsigned char kbrepeatrate(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 */
|
/* CBM kernal functions */
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user