From nobody Thu Jan 26 18:10:06 2023 X-Original-To: dev-commits-src-all@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 4P2pdp2cY9z3bHKT; Thu, 26 Jan 2023 18:10:06 +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 4P2pdp228hz3xlY; Thu, 26 Jan 2023 18:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674756606; 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=V+d54JNycarqumBDP693n7LjLV8VgIHzn/vEonylSos=; b=lfJS7MWu2lGiAdVvCRwjbIUdNcGWXJXLAGYZkXMhmO9TvoO0tUG/kzhY/uaZdQlf8uu3xy 30YP+X4m2wS3sJmmKvActbwNsOtQvlp7ZxiYAQD6B8dN/p3km4erq1J4Xgrbj0++QJkASy kxvFC/iru7qd0IICyDm//qd5Llk9R9nUY6Se2S4kUW2w93tmxG+NFPcoiDs0MEqfD++sFF Bn+1037lw7MmgreM4hD06Zvr8uj+1EuNYvd6p9QA0E0X2cNC6BGDMZU46bqJvN5j+oS96N LvJSrPKEiBq1BusjCXpvmIZj5jGcsKpn4VP8YGt+/5c4+oojyWAz5nmyPv2nDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674756606; 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=V+d54JNycarqumBDP693n7LjLV8VgIHzn/vEonylSos=; b=j+32ZFEPRirTG3BjWEw9hIz1OiXNllHs3eZLfkg1obYoRiciYiKO2CpcW3ks0P1GQ/+Vsh Tc4++gXDIY9tGm1pH5gBbCdHRGMEylDGMOHiDvU6c3c7B+4WJ1odElvokmNk/onvxNu5C9 Xzf6bHzo19yXvnKm9FQV8Qkgd37PS1imhU0cfgeguuYuJ0FLhBH7F84BADdQ6oejSANQT8 qxw/67JMD+Nds5PQYnwQy8wXcTMHLnsQ+xz77fc4J1RsPzN7i5KTWS9Xg8tOgvgsarYcZD fTURVTeE6O9CLG31USsY8gzE0yrdMyQRlAVsfsYGzci4kMW4+lFu/RFRpYlZsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674756606; a=rsa-sha256; cv=none; b=Ogzx8FzbBA1m+bmOFMsPw52EF88MDWZXcGtCPFfQ8jg6ojn/thTrp1VdWfkXWDIhX93AWu W2N1n2EQs1OyLrqYSUEtx0aoXg+FtXym5uL+sFdq4eBFrwLrqs8k0pfNCzo4AmgPRixIJk Q72ZiSqBrgt5gfMMUPWvISntRfIC/5F53x6OqpUCTMmuuCdHFI8UEnnJGm4rYheShm1RFf qn57Mhqc4jSVdzw1d7EvAbwfuLxree6yjTphLsJDDgOgqSporXBVr7fQcInBAXjYmgh3wE k9n+pTcug7h6cJ7Mt5WHBvYRb9FXChCODavYdmpwjBbjIDC9juXML9xpbNeM+w== 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 4P2pdp17LfzfKD; Thu, 26 Jan 2023 18:10:06 +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 30QIA6JE066248; Thu, 26 Jan 2023 18:10:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QIA6m6066245; Thu, 26 Jan 2023 18:10:06 GMT (envelope-from git) Date: Thu, 26 Jan 2023 18:10:06 GMT Message-Id: <202301261810.30QIA6m6066245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ec965063070e - main - lua: reduce diffs between luaconf.h copies List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec965063070e5753c166cf592c9336444b74720a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ec965063070e5753c166cf592c9336444b74720a commit ec965063070e5753c166cf592c9336444b74720a Author: Ed Maste AuthorDate: 2023-01-25 22:01:00 +0000 Commit: Ed Maste CommitDate: 2023-01-26 17:38:19 +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 --- 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 +