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

Uli Schlachter psychon at znc.in
Thu Feb 9 14:07:03 PST 2012


On 17.01.2012 21:59, 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 good to me, too. Pushed as commit 68d30adde982. In other news, I were
added to the xcb group on freedesktop. :-)

Cheers,
Uli

-- 
my $key = "\x49\x03\x93\x08\x19\x94\x96\x94\x28\x93\x83\x04\x68\x28\xa8\xf5".
          "\x0a\xb9\x94\x02\x45\x81\x93\x1f\xbc\xd7\xf3\xad\x93\xf5\x32\x93";
my $cipher = Crypt::Rijndael->new( $key, Crypt::Rijndael::MODE_ECB() );
my $plain = $ciper->decrypt($daten);


More information about the Xcb mailing list