Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix minheadless build #559

Merged
merged 2 commits into from Apr 20, 2021
Merged

Fix minheadless build #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0018411
define erro(x) macro rather than error
nicolas-cellier-aka-nice Apr 20, 2021
31f3191
Finish the clean-up of the 4 unused functions getButtonState & co
nicolas-cellier-aka-nice Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 1 addition & 6 deletions platforms/minheadless/common/sqPlatformSpecificCommon.h
View file
Open in desktop
Expand Up @@ -43,12 +43,11 @@ extern void sqFatalErrorPrintf(const char *format, ...);
extern void sqFatalErrorPrintfNoExit(const char *format, ...);
#ifndef error
extern void sqError(const char *errorMessage);
#define error sqError
#define error(x) sqError(x)
#endif




/*
#define messagePrintf sqMessagePrintf
#define warnPrintf sqWarnPrintf
Expand All @@ -59,10 +58,6 @@ extern void sqError(const char *errorMessage);
#define warnPrintf printf
#define errorPrintf printf

#ifndef error
#define error sqError
#endif

/* Function used by the Squeak security plugin. In a headless VM, do not create a message box. */
extern int sqAskSecurityYesNoQuestion(const char *question);

Expand Down
4 changes: 0 additions & 4 deletions platforms/minheadless/common/sqWindow-Null.c
View file
Open in desktop
Expand Up @@ -233,10 +233,6 @@ sqWindowSystem sqNullWindowSystem = {
.setWindowWidthHeight = sqNull_setWindowWidthHeight,
.isWindowObscured = sqNull_isWindowObscured,
.getNextEvent = sqNull_getNextEvent,
.getButtonState = sqNull_getButtonState,
.getKeystroke = sqNull_getKeystroke,
.mousePoint = sqNull_mousePoint,
.peekKeystroke = sqNull_peekKeystroke,
.processEvents = sqNull_processEvents,
.screenScaleFactor = sqNull_screenScaleFactor,
.screenSize = sqNull_screenSize,
Expand Down