thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 7.4.873

Browse Source 
Problem:    Compiler warning for unused variable. (Tony Mechelynck)
Solution:   Remove the variable.  Also fix int vs long_u mixup.
This commit is contained in:
Bram Moolenaar 2015-09-17 23:20:42 +02:00
parent 0600f3511c
commit b8603882b1
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/if_xcmdsrv.c
View File

@ -172,7 +172,7 @@ typedef int (*EndCond) __ARGS((void *));
struct x_cmdqueue struct x_cmdqueue
{ {
char_u *propInfo; char_u *propInfo;
int len; long_u len;
struct x_cmdqueue *next; struct x_cmdqueue *next;
struct x_cmdqueue *prev; struct x_cmdqueue *prev;
}; };
@ -199,8 +199,8 @@ static struct ServerReply *ServerReplyFind __ARGS((Window w, enum ServerReplyOp
static int AppendPropCarefully __ARGS((Display *display, Window window, Atom property, char_u *value, int length)); static int AppendPropCarefully __ARGS((Display *display, Window window, Atom property, char_u *value, int length));
static int x_error_check __ARGS((Display *dpy, XErrorEvent *error_event)); static int x_error_check __ARGS((Display *dpy, XErrorEvent *error_event));
static int IsSerialName __ARGS((char_u *name)); static int IsSerialName __ARGS((char_u *name));
static void save_in_queue __ARGS((char_u *buf, int len)); static void save_in_queue __ARGS((char_u *buf, long_u len));
static void server_parse_message __ARGS((Display *dpy, char_u *propInfo, int numItems)); static void server_parse_message __ARGS((Display *dpy, char_u *propInfo, long_u numItems));
/* Private variables for the "server" functionality */ /* Private variables for the "server" functionality */
static Atom registryProperty = None; static Atom registryProperty = None;
@ -1198,8 +1198,8 @@ serverEventProc(dpy, eventPtr, immediate)
*/ */
static void static void
save_in_queue(propInfo, len) save_in_queue(propInfo, len)
char_u *propInfo; char_u *propInfo;
int len; long_u len;
{ {
x_queue_T *node; x_queue_T *node;
@ -1228,7 +1228,6 @@ save_in_queue(propInfo, len)
void void
server_parse_messages() server_parse_messages()
{ {
char_u *p;
x_queue_T *node; x_queue_T *node;
if (!X_DISPLAY) if (!X_DISPLAY)
@ -1262,7 +1261,7 @@ server_waiting()
server_parse_message(dpy, propInfo, numItems) server_parse_message(dpy, propInfo, numItems)
Display *dpy; Display *dpy;
char_u *propInfo; /* A string containing 0 or more X commands */ char_u *propInfo; /* A string containing 0 or more X commands */
int numItems; /* The size of propInfo in bytes. */ long_u numItems; /* The size of propInfo in bytes. */
{ {
char_u *p; char_u *p;
int code; int code;

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
873,
/**/ /**/
872, 872,
/**/ /**/