diff options
author | Mike Pall <mike> | 2023-02-21 16:53:51 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2023-02-21 16:54:04 +0100 |
commit | eccdf6d6f86096ab8fbe8f8e67e5d2738739c176 (patch) | |
tree | 5b7e24dabdb62299a2707f026c07c73b3cce005c | |
parent | d0e88930ddde28ff662503f9f20facf34f7265aa (diff) | |
parent | 126526ab936a1b5c5015d31ab5d3bdac4ad0b19d (diff) | |
download | luajit2-eccdf6d6f86096ab8fbe8f8e67e5d2738739c176.tar.gz |
Merge branch 'master' into v2.1
-rw-r--r-- | src/host/buildvm_lib.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/host/buildvm_lib.c b/src/host/buildvm_lib.c index b125ea12..8914251e 100644 --- a/src/host/buildvm_lib.c +++ b/src/host/buildvm_lib.c @@ -378,14 +378,20 @@ void emit_lib(BuildCtx *ctx) char *p; /* Simplistic pre-processor. Only handles top-level #if/#endif. */ if (buf[0] == '#' && buf[1] == 'i' && buf[2] == 'f') { - int ok = 1; - if (!strcmp(buf, "#if LJ_52\n")) + int ok = 1, len = strlen(buf); + 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; - else if (!strcmp(buf, "#if LJ_HASJIT\n")) + else if (!strcmp(buf, "#if LJ_HASJIT")) ok = LJ_HASJIT; - else if (!strcmp(buf, "#if LJ_HASFFI\n")) + else if (!strcmp(buf, "#if LJ_HASFFI")) ok = LJ_HASFFI; - else if (!strcmp(buf, "#if LJ_HASBUFFER\n")) + else if (!strcmp(buf, "#if LJ_HASBUFFER")) ok = LJ_HASBUFFER; if (!ok) { int lvl = 1; |