diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-05-31 12:16:22 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-05-31 13:45:42 +0100 |
| commit | 894c81b75aa2ffc4eef3c56e4c72fe70c4080b99 (patch) | |
| tree | 37b5135e79a69a30e2eac3f81a17efdd4701a813 /com32/lua/src/lualib.h | |
| parent | 98e33fa25fb8feeb66cbf20b9cba0d5adff3e658 (diff) | |
| parent | ba42e1409ece2e9d56728e0ee6a6342c05ec6e52 (diff) | |
| download | syslinux-894c81b75aa2ffc4eef3c56e4c72fe70c4080b99.tar.gz | |
Merge remote-tracking branch 'zytor/master' into merge/elflink/master
A lot of development has gone on in the 'master' branch since the last
time we merged; new features, bug fixes, etc, etc.
Conflicts:
Makefile
com32/Makefile
com32/lib/Makefile
com32/lib/syslinux/load_linux.c
com32/modules/Makefile
com32/modules/chain.c
core/bootsect.inc
core/init.inc
version
Diffstat (limited to 'com32/lua/src/lualib.h')
| -rw-r--r-- | com32/lua/src/lualib.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/com32/lua/src/lualib.h b/com32/lua/src/lualib.h index 0ae6ba75..40d1bf29 100644 --- a/com32/lua/src/lualib.h +++ b/com32/lua/src/lualib.h @@ -54,6 +54,9 @@ LUALIB_API int (luaopen_vesa) (lua_State *L); #define LUA_CPULIBNAME "cpu" LUALIB_API int (luaopen_cpu) (lua_State *L); + +#define LUA_DHCPLIBNAME "dhcp" +LUALIB_API int (luaopen_dhcp) (lua_State *L); #endif /* open all previous libraries */ |