Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-30 22:13:49 +00:00
Code Releases Activity

Merge pull request #59 from librehat/master

Browse Source 
Fix mingw64 compiling errors
This commit is contained in:
Max Lv
2014-04-03 15:35:20 +08:00
parent 94bd9dfa0a 1948330bc2
commit de5408a00c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/json.c
+1 -1
View File
@@ -132,7 +132,7 @@ static int new_value
values_size = sizeof (*value->u.object.values) * value->u.object.length;
if (! ((*(void **) &value->u.object.values) = json_alloc
(state, values_size + ((unsigned long) value->u.object.values), 0)) )
(state, values_size + ((unsigned long long) value->u.object.values), 0)) )
{
return 0;
}
src/win32.c
+2 -2
View File
@@ -33,7 +33,7 @@ void ss_error(const char *s)
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPTSTR) &msg, 0, NULL);
if (msg != NULL) {
LOGE("%s: %s", s, msg);
LOGE("%s: %s", s, (char *)msg);
LocalFree(msg);
}
}
@@ -41,7 +41,7 @@ void ss_error(const char *s)
int setnonblocking(int fd)
{
u_long iMode = 0;
int iResult;
long int iResult;
iResult = ioctlsocket(fd, FIONBIO, &iMode);
if (iResult != NO_ERROR) {
LOGE("ioctlsocket failed with error: %ld\n", iResult);