Merge pull request #559 from OpenSmalltalk/fix_minheadless_build

Fix minheadless build
OpenSmalltalk · Apr 20, 2021 · ccf7efb · ccf7efb
2 parents 331b8cd + 31f3191
commit ccf7efb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/platforms/minheadless/common/sqPlatformSpecificCommon.h b/platforms/minheadless/common/sqPlatformSpecificCommon.h
@@ -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
@@ -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);
 

diff --git a/platforms/minheadless/common/sqWindow-Null.c b/platforms/minheadless/common/sqWindow-Null.c
@@ -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,