From nobody Mon Feb 20 16:22:45 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PL74Q1cBDz3t2DS; Mon, 20 Feb 2023 16:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PL74P6LnYz4BqJ; Mon, 20 Feb 2023 16:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676910165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r11Sp0upfU6RNoI5BTA7L+VqW37dUazY5Ruowyg/ZKo=; b=PYI4M7jG4I8BHUs5VUF3uF31sWFg1EaNCiHnyY6V3nojHvToDnmFSP9G04zqt0RUH4lik6 TAxw/QecDCKZirm1dmDV/eHsl2K2eV1N81asGZGGgBombEP/iGyspc/di1GhfHM/sAek/D +pEzjDCfWPSqhmYU9156WUcUUsW+9Lmm54k/sYQTVp62NKm7OKXr9agHnagfOYOMLhzCzq HC4mwsC2efGaqHenVcILMzIBcFQQg+VqAry9EFmSw47jbasn3zRoXPJnSL4yR9fxK0nc3f QXLFRIbG712tbkQTBuy97w0n0niXESi4xu35R8uEOzH6XYuChA8Lq4fXFf2iTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676910165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r11Sp0upfU6RNoI5BTA7L+VqW37dUazY5Ruowyg/ZKo=; b=pr8p1Y3kL3xV6qavXMva8jYaxeDSzfsf4ngiRiKBYua1Nge97+B1lexZPcdLfTTCngNerB IfuAyA3YeI1Ay+be5kjLrKikk5W8XN/yu4HOpfyUk/R6nhuzRF9YSffLnSl0tDpVLlPM3X kgmc4Ph/Q6h7d9I6AsBuHEM/vhMGQOQqI/mbMu+9yyMV+LeZtS4xupxI/4/GGXyb7UW8bh FJBcXjRfOc6An0s9Zqmopf1Od7tPuXcvJ0oTN3Pvpma8cWu0xW43P+3B0yDq2gi4+3P5/7 QBSIUGHt/mFbIBLSNeVwhYl/9tUFInhOfixFOmozogzX3f0MYiVZWOUlrtEAaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676910165; a=rsa-sha256; cv=none; b=MT7wNXnzYgjZ+q7UEak+Ls6yc/9IQxMmbcOPQYBsVfwQPjyFOzZBwm+fvpgA+mhe205TTO IcBLOp0Uha2FDTXmyJdLXwHXtu2OYhzmq8mJ5KW+tiqKic4aN5hhOQlUZ0FftSASjdWIhc wELS7w7S9lqeY4sg9LN0oQ6ux/dxVw+IDfq7VMTAfojimadZShlXnRPalLZlmtDk4PLtda eUO1UedbDHzSzchoWVxGKtLftWjWFV8jAy67onnZLTWGfcs0NThTvFIHzG5wvMspY2SpmX q3NhnVkWp62dYyqep7ygUHC6j42lR9ndDI0CXM8HvqgfowizvTeVfBGaM3bwqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PL74P5SmqznX5; Mon, 20 Feb 2023 16:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31KGMjeu064319; Mon, 20 Feb 2023 16:22:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KGMj2J064318; Mon, 20 Feb 2023 16:22:45 GMT (envelope-from git) Date: Mon, 20 Feb 2023 16:22:45 GMT Message-Id: <202302201622.31KGMj2J064318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 06d74a746eb1 - stable/13 - lua: reduce diffs between luaconf.h copies List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 06d74a746eb1a8d62bc5669763f5f48d2441d382 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=06d74a746eb1a8d62bc5669763f5f48d2441d382 commit 06d74a746eb1a8d62bc5669763f5f48d2441d382 Author: Ed Maste AuthorDate: 2023-02-20 16:19:35 +0000 Commit: Warner Losh CommitDate: 2023-02-20 16:21:08 +0000 lua: reduce diffs between luaconf.h copies Upstream luaconf.h is contrib/lua/src/luaconf.h.dist, while userland lua and loader lua have copies in lib/liblua/luaconf.h and stand/liblua/luaconf.h. Adjust whitespace, VCS tags, etc. to match upstream's version, for ease of comparison. Reviewed By: imp Sponsored By: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38206 (cherry picked from commit ec965063070e5753c166cf592c9336444b74720a) --- lib/liblua/luaconf.h | 6 +++--- stand/liblua/luaconf.h | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/liblua/luaconf.h b/lib/liblua/luaconf.h index 892ac3a0c8f3..d5ac628e3052 100644 --- a/lib/liblua/luaconf.h +++ b/lib/liblua/luaconf.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* ** $Id: luaconf.h $ ** Configuration file for Lua @@ -83,7 +82,7 @@ */ #define LUAI_IS32INT ((UINT_MAX >> 30) >= 3) -/* }================================================================== */ +/* }================================================================== */ @@ -203,6 +202,7 @@ #define LUA_LDIR "!\\lua\\" #define LUA_CDIR "!\\" #define LUA_SHRDIR "!\\..\\share\\lua\\" LUA_VDIR "\\" + #if !defined(LUA_PATH_DEFAULT) #define LUA_PATH_DEFAULT \ LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \ @@ -211,7 +211,7 @@ ".\\?.lua;" ".\\?\\init.lua" #endif -#if !define(LUA_CPATH_DEFAULT) +#if !defined(LUA_CPATH_DEFAULT) #define LUA_CPATH_DEFAULT \ LUA_CDIR"?.dll;" \ LUA_CDIR"..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \ diff --git a/stand/liblua/luaconf.h b/stand/liblua/luaconf.h index 8a0ad782e5e1..d5c222ce30be 100644 --- a/stand/liblua/luaconf.h +++ b/stand/liblua/luaconf.h @@ -1,6 +1,5 @@ -/* $FreeBSD$ */ /* -** $Id: luaconf.h,v 1.259 2016/12/22 13:08:50 roberto Exp $ +** $Id: luaconf.h $ ** Configuration file for Lua ** See Copyright Notice in lua.h */ @@ -218,7 +217,7 @@ #define LUA_LDIR LUA_ROOT "share/" #define LUA_CDIR LUA_ROOT "lib/" -#ifndef LUA_PATH_DEFAULT +#if !defined(LUA_PATH_DEFAULT) #define LUA_PATH_DEFAULT \ LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \ @@ -433,6 +432,7 @@ #define lua_str2number(s,p) strtof((s), (p)) + #elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE /* }{ long double */ #define LUA_NUMBER long double @@ -783,3 +783,4 @@ #endif +