diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
| commit | 2d042f719910c5aa1ba9f4a47b21009c729c345e (patch) | |
| tree | 2b20d89d5f1ca342ca6f1d817c18b324adf7086f /libxcb | |
| parent | c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (diff) | |
| parent | 854ec4da20ddff9b830be0a7d5b81d8cb4774132 (diff) | |
| download | vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.gz vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.bz2 vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013
Conflicts:
fontconfig/src/fccache.c
Diffstat (limited to 'libxcb')
| -rw-r--r-- | libxcb/configure.ac | 6 | ||||
| -rw-r--r-- | libxcb/src/xcb_list.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libxcb/configure.ac b/libxcb/configure.ac index 736438305..482f85b2b 100644 --- a/libxcb/configure.ac +++ b/libxcb/configure.ac @@ -128,12 +128,12 @@ xcbincludedir='${includedir}/xcb' AC_SUBST(xcbincludedir) if test "x$GCC" = xyes ; then - CWARNFLAGS="-Wall -pedantic -Wpointer-arith \ + CWARNFLAGS="-Wall -pedantic -Wpointer-arith -Wold-style-definition \ -Wstrict-prototypes -Wmissing-declarations -Wnested-externs" else AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) if test "x$SUNCC" = "xyes"; then - CWARNFLAGS="-v" + CWARNFLAGS="-v -fd" fi fi AC_SUBST(CWARNFLAGS) @@ -192,7 +192,7 @@ XCB_EXTENSION(XFixes, "yes") XCB_EXTENSION(XFree86-DRI, "yes") XCB_EXTENSION(Xinerama, "yes") XCB_EXTENSION(XInput, "no") -XCB_EXTENSION(XKB, "no") +XCB_EXTENSION(XKB, "yes") XCB_EXTENSION(Xprint, "yes") XCB_EXTENSION(SELinux, "no") XCB_EXTENSION(XTest, "yes") diff --git a/libxcb/src/xcb_list.c b/libxcb/src/xcb_list.c index 6f5c61190..129540bc4 100644 --- a/libxcb/src/xcb_list.c +++ b/libxcb/src/xcb_list.c @@ -47,7 +47,7 @@ struct _xcb_map { /* Private interface */ -_xcb_map *_xcb_map_new() +_xcb_map *_xcb_map_new(void) { _xcb_map *list; list = malloc(sizeof(_xcb_map)); |