Skip to content

Commit

Permalink
Fixed compiler warning
Browse files Browse the repository at this point in the history
  • Loading branch information
ynkdir committed Mar 4, 2011
1 parent 9708842 commit 1f3b574
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions src/vimremote_win32.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

#include <stdio.h>

#include <windows.h>

#include "vimthings.h"
Expand Down Expand Up @@ -57,7 +59,7 @@ vimremote_uninit()
int
vimremote_serverlist(char **servernames)
{
*servernames = serverGetVimNames();
*servernames = (char *)serverGetVimNames();
return 0;
}

Expand Down Expand Up @@ -224,7 +226,6 @@ Messaging_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
HWND sender = (HWND)wParam;
COPYDATASTRUCT reply;
char_u *res;
char_u winstr[30];
int retval;
char_u *str;
char_u *tofree;
Expand Down Expand Up @@ -253,7 +254,7 @@ Messaging_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
}
else
{
err = usereval(str, &res);
err = usereval((char *)str, (char **)&res);
}

vim_free(tofree);
Expand All @@ -262,7 +263,7 @@ Messaging_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
reply.dwData = COPYDATA_RESULT;
else
reply.dwData = COPYDATA_ERROR_RESULT;
reply.lpData = (res == NULL) ? "" : res;
reply.lpData = (res == NULL) ? (char_u *)"" : res;
reply.cbData = (res == NULL) ? 0 : (DWORD)STRLEN(res) + 1;

serverSendEnc(sender);
Expand Down Expand Up @@ -386,8 +387,8 @@ enumWindowsGetNames(HWND hwnd, LPARAM lparam)
return TRUE;

/* Add the name to the list */
ga_concat(ga, server);
ga_concat(ga, "\n");
ga_concat(ga, (char_u *)server);
ga_concat(ga, (char_u *)"\n");
return TRUE;
}

Expand Down Expand Up @@ -417,7 +418,7 @@ serverSetName(char_u *name)
serverName = vim_strsave(name);

/* Update the message window title */
SetWindowText(message_window, name);
SetWindowText(message_window, (char *)name);

return TRUE;
}
Expand Down

0 comments on commit 1f3b574

Please sign in to comment.