[src/netbsd-7]: src/sys/modules/lua Pull up following revision(s) (requested ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/969960c01e48
branches:  netbsd-7
changeset: 798648:969960c01e48
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Dec 01 13:13:15 2014 +0000

description:
Pull up following revision(s) (requested by lneto in ticket #283):
        sys/modules/lua/lua.c: revision 1.15
lua(4): fixed require

diffstat:

 sys/modules/lua/lua.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r efcf02c3ebb2 -r 969960c01e48 sys/modules/lua/lua.c
--- a/sys/modules/lua/lua.c     Mon Dec 01 13:11:18 2014 +0000
+++ b/sys/modules/lua/lua.c     Mon Dec 01 13:13:15 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lua.c,v 1.13 2014/07/25 08:10:40 dholland Exp $ */
+/*     $NetBSD: lua.c,v 1.13.2.1 2014/12/01 13:13:15 martin Exp $ */
 
 /*
  * Copyright (c) 2014 by Lourival Vieira Neto <lneto%NetBSD.org@localhost>.
@@ -367,7 +367,11 @@
                                                            m->mod_name,
                                                            s->lua_name);
                                                klua_lock(s->K);
-                                               m->open(s->K->L);
+                                               luaL_requiref(
+                                                       s->K->L,
+                                                       m->mod_name,
+                                                       m->open,
+                                                       1);
                                                klua_unlock(s->K);
                                                m->refcount++;
                                                LIST_INSERT_HEAD(
@@ -507,7 +511,8 @@
                                        device_printf(sc_self,
                                            "require module %s\n",
                                            md->mod_name);
-                               md->open(L);
+                               luaL_requiref(L, md->mod_name, md->open, 0);
+
                                md->refcount++;
                                LIST_INSERT_HEAD(&s->lua_modules, md, mod_next);
                                return 1;