From: Mike Pall <mike>
Date: Wed, 22 Jan 2020 01:39:26 +0000 (+0100)
Subject: Merge branch 'master' into v2.1
X-Git-Tag: v2.1.ROLLING~276
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=694d69aed910e524d4ad6ebbda7ac4e925c56202;p=thirdparty%2FLuaJIT.git

Merge branch 'master' into v2.1
---

694d69aed910e524d4ad6ebbda7ac4e925c56202
diff --cc src/jit/bcsave.lua
index 4935ea8f,58351c16..42d7240b
--- a/src/jit/bcsave.lua
+++ b/src/jit/bcsave.lua
@@@ -132,8 -118,8 +132,8 @@@ en
  local function bcsave_c(ctx, output, s)
    local fp = savefile(output, "w")
    if ctx.type == "c" then
 -    fp:write(string.format([[
 +    fp:write(format([[
- #ifdef _cplusplus
+ #ifdef __cplusplus
  extern "C"
  #endif
  #ifdef _WIN32