summaryrefslogtreecommitdiff
path: root/external/mit/lua/dist/src/lobject.c
diff options
context:
space:
mode:
authoralnsn <alnsn@NetBSD.org>2018-08-04 17:30:01 +0000
committeralnsn <alnsn@NetBSD.org>2018-08-04 17:30:01 +0000
commit3759ec8accd3a9c6a366fe711feeda9574464ada (patch)
tree1204eb9c92f8c012c3793806232b6501dc4c2e47 /external/mit/lua/dist/src/lobject.c
parentf24b54d3a35ec193641f87f0c2dc7c67a0fb4f3e (diff)
Resolve conflicts.
Diffstat (limited to 'external/mit/lua/dist/src/lobject.c')
-rw-r--r--external/mit/lua/dist/src/lobject.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/external/mit/lua/dist/src/lobject.c b/external/mit/lua/dist/src/lobject.c
index ea4e42d7b08..d3593092022 100644
--- a/external/mit/lua/dist/src/lobject.c
+++ b/external/mit/lua/dist/src/lobject.c
@@ -1,7 +1,7 @@
-/* $NetBSD: lobject.c,v 1.11 2017/04/26 13:17:33 mbalmer Exp $ */
+/* $NetBSD: lobject.c,v 1.12 2018/08/04 17:30:01 alnsn Exp $ */
/*
-** Id: lobject.c,v 2.113 2016/12/22 13:08:50 roberto Exp
+** Id: lobject.c,v 2.113.1.1 2017/04/19 17:29:57 roberto Exp
** Some generic functions over Lua objects
** See Copyright Notice in lua.h
*/
@@ -466,7 +466,8 @@ const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
}
case 'p': { /* a pointer */
char buff[4*sizeof(void *) + 8]; /* should be enough space for a '%p' */
- int l = l_sprintf(buff, sizeof(buff), "%p", va_arg(argp, void *));
+ void *p = va_arg(argp, void *);
+ int l = lua_pointer2str(buff, sizeof(buff), p);
pushstr(L, buff, l);
break;
}