diff options
author | marha <marha@users.sourceforge.net> | 2014-06-26 11:59:47 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-06-26 11:59:47 +0200 |
commit | ac314766fd4f60b8ee0346b7586c1a5a6f533e11 (patch) | |
tree | 0fc30960e502b9502ddb2b77ee1625b2c80df4dd /include/xcb | |
parent | 095ea6e18c55df550fda14f72c2d174af9b239ba (diff) | |
download | vcxsrv-ac314766fd4f60b8ee0346b7586c1a5a6f533e11.tar.gz vcxsrv-ac314766fd4f60b8ee0346b7586c1a5a6f533e11.tar.bz2 vcxsrv-ac314766fd4f60b8ee0346b7586c1a5a6f533e11.zip |
Update project files to solved compilation problems due to latest merge
Diffstat (limited to 'include/xcb')
-rw-r--r-- | include/xcb/xcb.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/include/xcb/xcb.h b/include/xcb/xcb.h index ec5cd3301..b180be8ef 100644 --- a/include/xcb/xcb.h +++ b/include/xcb/xcb.h @@ -458,7 +458,8 @@ int xcb_get_file_descriptor(xcb_connection_t *c); * Some errors that occur in the context of an xcb_connection_t * are unrecoverable. When such an error occurs, the * connection is shut down and further operations on the - * xcb_connection_t have no effect. + * xcb_connection_t have no effect, but memory will not be freed until + * xcb_disconnect() is called on the xcb_connection_t. * * @return XCB_CONN_ERROR, because of socket errors, pipe errors or other stream errors. * @return XCB_CONN_CLOSED_EXT_NOTSUPPORTED, when extension not supported. @@ -480,6 +481,11 @@ int xcb_connection_has_error(xcb_connection_t *c); * bidirectionally connected to an X server. If the connection * should be unauthenticated, @p auth_info must be @c * NULL. + * + * Always returns a non-NULL pointer to a xcb_connection_t, even on failure. + * Callers need to use xcb_connection_has_error() to check for failure. + * When finished, use xcb_disconnect() to close the connection and free + * the structure. */ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info); @@ -525,6 +531,11 @@ int xcb_parse_display(const char *name, char **host, int *display, int *screen); * variable. If a particular screen on that server is preferred, the * int pointed to by @p screenp (if not @c NULL) will be set to that * screen; otherwise the screen will be set to 0. + * + * Always returns a non-NULL pointer to a xcb_connection_t, even on failure. + * Callers need to use xcb_connection_has_error() to check for failure. + * When finished, use xcb_disconnect() to close the connection and free + * the structure. */ xcb_connection_t *xcb_connect(const char *displayname, int *screenp); @@ -539,6 +550,11 @@ xcb_connection_t *xcb_connect(const char *displayname, int *screenp); * authorization @p auth. If a particular screen on that server is * preferred, the int pointed to by @p screenp (if not @c NULL) will * be set to that screen; otherwise @p screenp will be set to 0. + * + * Always returns a non-NULL pointer to a xcb_connection_t, even on failure. + * Callers need to use xcb_connection_has_error() to check for failure. + * When finished, use xcb_disconnect() to close the connection and free + * the structure. */ xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *display, xcb_auth_info_t *auth, int *screen); |