Skip to content

Commit

Permalink
Fix issue #557 (workaround?)
Browse files Browse the repository at this point in the history
If we build an internal plugin `SQUEAK_BUILTIN_PLUGIN`, then we don't need to `EXPORT` the error/warning functions.
There are still conflicting definitions in sqVirtualMachine.h which totally ignore IMPORT/EXPORT but these only generate warnings, not errors.
  • Loading branch information
nicolas-cellier-aka-nice committed Apr 20, 2021
1 parent 4e791b8 commit ce7f664
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions platforms/Cross/vm/sqAssert.h
Expand Up @@ -21,12 +21,18 @@ IMPORT(void) error(const char *);
IMPORT(void) warning(const char *);
IMPORT(void) warningat(const char *,int);
#else
# if !defined(EXPORT)
# define EXPORT(returnType) returnType
# endif
# if defined(SQUEAK_BUILTIN_PLUGIN)
void error(const char *);
void warning(const char *);
void warningat(const char *,int);
# else
# if !defined(EXPORT)
# define EXPORT(returnType) returnType
# endif
EXPORT(void) error(const char *);
EXPORT(void) warning(const char *);
EXPORT(void) warningat(const char *,int);
# endif
#endif
#pragma auto_inline(on)

Expand Down

0 comments on commit ce7f664

Please sign in to comment.