Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2023-02-21 16:53:51 +01:00
commit eccdf6d6f8

View File

@ -378,14 +378,20 @@ void emit_lib(BuildCtx *ctx)
char *p; char *p;
/* Simplistic pre-processor. Only handles top-level #if/#endif. */ /* Simplistic pre-processor. Only handles top-level #if/#endif. */
if (buf[0] == '#' && buf[1] == 'i' && buf[2] == 'f') { if (buf[0] == '#' && buf[1] == 'i' && buf[2] == 'f') {
int ok = 1; int ok = 1, len = strlen(buf);
if (!strcmp(buf, "#if LJ_52\n")) if (buf[len-1] == '\n') {
buf[len-1] = 0;
if (buf[len-2] == '\r') {
buf[len-2] = 0;
}
}
if (!strcmp(buf, "#if LJ_52"))
ok = LJ_52; ok = LJ_52;
else if (!strcmp(buf, "#if LJ_HASJIT\n")) else if (!strcmp(buf, "#if LJ_HASJIT"))
ok = LJ_HASJIT; ok = LJ_HASJIT;
else if (!strcmp(buf, "#if LJ_HASFFI\n")) else if (!strcmp(buf, "#if LJ_HASFFI"))
ok = LJ_HASFFI; ok = LJ_HASFFI;
else if (!strcmp(buf, "#if LJ_HASBUFFER\n")) else if (!strcmp(buf, "#if LJ_HASBUFFER"))
ok = LJ_HASBUFFER; ok = LJ_HASBUFFER;
if (!ok) { if (!ok) {
int lvl = 1; int lvl = 1;