[Xcb] [PATCH] Update use of error_connection under WIN32 to _xcb_conn_ret_error()

Arvind Umrao arvind.umrao at oracle.com
Tue Jan 17 23:03:47 PST 2012


On 01/18/12 02:29, Jon TURNEY wrote:
> Unfortunately, commit 31b57676 adding WSACleanup/WSAShutdown on Win32 adds a new use
> of error_connection, which was removed in commit 769acff0, applied 5 minutes earlier.
>
> src/xcb_util.c: In function 'xcb_connect_to_display_with_auth_info':
> src/xcb_util.c:433:39: error: 'error_connection' undeclared (first use in this function)
>
> Signed-off-by: Jon TURNEY<jon.turney at dronecode.org.uk>
> ---
>   src/xcb_util.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/src/xcb_util.c b/src/xcb_util.c
> index 9329b81..7173db3 100644
> --- a/src/xcb_util.c
> +++ b/src/xcb_util.c
> @@ -430,7 +430,7 @@ xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname,
>   #ifdef _WIN32
>           WSADATA wsaData;
>           if (WSAStartup(MAKEWORD(2, 2),&wsaData) != 0) {
> -            c = (xcb_connection_t *)&error_connection;
> +            c = _xcb_conn_ret_error(XCB_CONN_ERROR);
>               goto out;
>           }
>   #endif

Looks fine. My vote does not count much but you mine

Reviewed-by: Arvind Umrao<arvind.umrao at oracle.com>

-Arvind


More information about the Xcb mailing list