dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2025-07-20 15:59:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'git-sam' into diego-sam-mwild-integration

Browse Source 
Conflicts in options.c were just due to independent small functions
being close to each other.

unix.c in mwild was broken, it wasn't using LUASOCKET_API.

serial.c needed luaL_reg renamed, and to use LUASOCKET_API.

makefile didn't respect standard DESTDIR and prefix makefile
variables, and didn't allow LUAV variable to select lua version to build
against.

I've tested the top-level install-both target builds and installs
against both lua5.1 and lua5.2, but not done further testing.

Conflicts:
	README
	config
	gem/ltn012.tex
	makefile
	src/makefile
	src/options.c
	src/options.h
	src/tcp.c
	src/usocket.c
This commit is contained in:
Sam Roberts
2012-04-11 14:18:20 -07:00
parent f399ab25fc 195b2a74bb
commit 4b671f4551
22 changed files with 656 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mime.lua
View File

@ -11,7 +11,6 @@
local base = _G
local ltn12 = require("ltn12")
local mime = require("mime.core")
local io = require("io")
local string = require("string")
module("mime")