diff options
| author | mbalmer <mbalmer@NetBSD.org> | 2015-10-08 13:21:00 +0000 |
|---|---|---|
| committer | mbalmer <mbalmer@NetBSD.org> | 2015-10-08 13:21:00 +0000 |
| commit | 649cf8e53381cbc6057d92bbf44588bb7024bdd2 (patch) | |
| tree | 37d60c2028507b3425901810054e008ce1f65440 /external/mit/lua/dist/src/loadlib.c | |
| parent | 14a62719979f511f0c63a80b66d3ca7202ffc862 (diff) | |
update after conflict resolution
Diffstat (limited to 'external/mit/lua/dist/src/loadlib.c')
| -rw-r--r-- | external/mit/lua/dist/src/loadlib.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/external/mit/lua/dist/src/loadlib.c b/external/mit/lua/dist/src/loadlib.c index 3acc4c2c8b3..d638269c46f 100644 --- a/external/mit/lua/dist/src/loadlib.c +++ b/external/mit/lua/dist/src/loadlib.c @@ -1,5 +1,7 @@ +/* $NetBSD: loadlib.c,v 1.4 2015/10/08 13:21:00 mbalmer Exp $ */ + /* -** $Id: loadlib.c,v 1.3 2015/02/02 14:03:05 lneto Exp $ +** Id: loadlib.c,v 1.126 2015/02/16 13:14:33 roberto Exp ** Dynamic library loader for Lua ** See Copyright Notice in lua.h ** @@ -14,6 +16,7 @@ #include "lprefix.h" +#include <stdio.h> #include <stdlib.h> #include <string.h> @@ -136,8 +139,8 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym); #include <dlfcn.h> /* -** Macro to covert pointer to void* to pointer to function. This cast -** is undefined according to ISO C, but POSIX assumes that it must work. +** Macro to convert pointer-to-void* to pointer-to-function. This cast +** is undefined according to ISO C, but POSIX assumes that it works. ** (The '__extension__' in gnu compilers is only to avoid warnings.) */ #if defined(__GNUC__) |
