Browse Source

Merge pull request #59 from librehat/master

Fix mingw64 compiling errors
pull/63/head
Max Lv 11 years ago
parent
commit
de5408a00c
2 changed files with 3 additions and 3 deletions
  1. 2
      src/json.c
  2. 4
      src/win32.c

2
src/json.c

@ -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;
}

4
src/win32.c

@ -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);

Loading…
Cancel
Save