Skip to content

Commit

Permalink
Make Win32 prototype of ioSetCursorARGB Cross-compatible
Browse files Browse the repository at this point in the history
conflicting prototype make compilation fail
  • Loading branch information
nicolas-cellier-aka-nice committed Jan 31, 2020
1 parent f6169e0 commit 0876850
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion platforms/win32/vm/sqPlatformSpecific.h
Expand Up @@ -101,7 +101,7 @@ size_t sqImageFileWrite(const void *ptr, size_t sz, size_t count, sqImageFile h)
error "Not Win32 or Win64!"
#endif /* _WIN32 || _WIN64 */

int ioSetCursorARGB(sqInt bitsIndex, sqInt w, sqInt h, sqInt x, sqInt y);
sqInt ioSetCursorARGB(sqInt bitsIndex, sqInt w, sqInt h, sqInt x, sqInt y);

/* poll and profile thread priorities. The stack vm uses a thread to cause the
* VM to poll for I/O, check for delay expiry et al at regular intervals. Both
Expand Down
2 changes: 1 addition & 1 deletion platforms/win32/vm/sqWin32Window.c
Expand Up @@ -1930,7 +1930,7 @@ sqInt ioSetCursor(sqInt cursorBitsIndex, sqInt offsetX, sqInt offsetY) {
return ioSetCursorWithMask(cursorBitsIndex, 0, offsetX, offsetY);
}

int ioSetCursorARGB(sqInt bitsIndex, sqInt w, sqInt h, sqInt x, sqInt y) {
sqInt ioSetCursorARGB(sqInt bitsIndex, sqInt w, sqInt h, sqInt x, sqInt y) {
ICONINFO info;
HBITMAP hbmMask = NULL;
HBITMAP hbmColor = NULL;
Expand Down

0 comments on commit 0876850

Please sign in to comment.