From ec965063070e5753c166cf592c9336444b74720a Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 25 Jan 2023 17:01:00 -0500
Subject: [PATCH] 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
+