Lua-cURL/Lua-cURLv3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16 from moteus/master

Browse Source 
Fix. Warnings on MinGW
This commit is contained in:
Alexey Melnichuk 2014-09-10 16:07:16 +05:00
commit caa1b28158
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lakefile
View File

@ -1,4 +1,4 @@
PROJECT = 'lcurl'
PROJECT = 'cURL'
INITLAKEFILE()
@ -6,7 +6,7 @@ DEFINES = L{DEFINES,
IF(WINDOWS, 'DLL_EXPORT', '');
}
cURL = c.shared{PROJECT,
cURL = c.shared{'lcurl',
base = 'src',
src = '*.c',
needs = {LUA_NEED, 'libcurl', IF(WINDOWS, 'winsock2', 'sockets')},
@ -19,7 +19,7 @@ target('build', cURL)
install = target('install', {
file.group{odir=LIBDIR; src = cURL };
file.group{odir=J(LIBDIR, PROJECT); src = J("src", "lua") };
file.group{odir=J(LIBDIR, PROJECT); src = J("src", "lua") ; recurse = true };
file.group{odir=J(ROOT, 'examples'); src = 'examples'; recurse = true };
file.group{odir=TESTDIR; src = 'test'; recurse = true };
})

2
src/lceasy.c
View File

@ -410,7 +410,7 @@ static int lcurl_easy_unset_HTTPPOST(lua_State *L){
we also unset it to be sure that there no way to
call default curl reader with our READDATA
*/
curl_easy_setopt(p->curl, CURLOPT_READFUNCTION, 0);
curl_easy_setopt(p->curl, CURLOPT_READFUNCTION, (void*)0);
curl_easy_setopt(p->curl, CURLOPT_READDATA, 0);
}
lcurl_storage_remove_i(L, p->storage, CURLOPT_HTTPPOST);

3
src/lcutils.h
View File

@ -16,7 +16,8 @@
#define LCURL_MAKE_VERSION(MIN, MAJ, PAT) ((MIN<<16) + (MAJ<<8) + PAT)
#define LCURL_CURL_VER_GE(MIN, MAJ, PAT) (LIBCURL_VERSION_NUM >= LCURL_MAKE_VERSION(MIN, MAJ, PAT))
#define LCURL_STATIC_ASSERT(A) {(int(*)[(A)?1:0])0;}
//! @fixme on mingw32 (gcc 4.8.1) this does not work
#define LCURL_STATIC_ASSERT(A) {(void)(int(*)[(A)?1:0])0;}
typedef struct lcurl_const_tag{
const char *name;