diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-05 23:40:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-05 23:42:09 +0100 |
| commit | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (patch) | |
| tree | ba0af42750f0ab6dc4724342a7063835636222b5 /libxcb | |
| parent | 87e58a93f7248171e736656080069cb65ff56aae (diff) | |
| parent | 8574eba804031f6b19713f0b02952280730bf62e (diff) | |
| download | vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.gz vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.bz2 vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/queryobj.c
Diffstat (limited to 'libxcb')
| -rw-r--r-- | libxcb/src/makefile | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | libxcb/src/xcb_in.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libxcb/src/makefile b/libxcb/src/makefile index d76306138..107250a91 100644 --- a/libxcb/src/makefile +++ b/libxcb/src/makefile @@ -19,6 +19,7 @@ XCBPROTO_XCBINCLUDEDIR = ..\xcb-proto\src XMLFILES := $(notdir $(wildcard $(XCBPROTO_XCBINCLUDEDIR)\*.xml)) XMLFILES := $(filter-out xkb.xml, $(XMLFILES)) +XMLFILES := $(filter-out xprint.xml, $(XMLFILES)) EXTSOURCES := $(XMLFILES:%.xml=%.c) CSRCS += $(EXTSOURCES) diff --git a/libxcb/src/xcb_in.c b/libxcb/src/xcb_in.c index dfcd1ecd8..ad870c174 100644..100755 --- a/libxcb/src/xcb_in.c +++ b/libxcb/src/xcb_in.c @@ -56,7 +56,6 @@ #define XCB_REPLY 1 #define XCB_XGE_EVENT 35 - struct event_list { xcb_generic_event_t *event; struct event_list *next; |